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.433 by root, Thu May 9 05:40:14 2013 UTC vs.
Revision 1.470 by root, Fri Jul 14 13:14:32 2017 UTC

14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1 18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
19#include "ecb.h" 20#include "ecb.h"
20 21
21#include <stddef.h> 22#include <stddef.h>
22#include <stdio.h> 23#include <stdio.h>
23#include <errno.h> 24#include <errno.h>
24#include <assert.h> 25#include <assert.h>
25 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
26#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
28#endif 37#endif
29 38
30#ifdef PadARRAY 39#ifdef PadARRAY
31# define NEWPADAPI 40# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *)) 41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else 42#else
34typedef AV PADNAMELIST; 43typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0) 44# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST; 45typedef AV PADLIST;
41# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY 51# define PadARRAY AvARRAY
43# define PadMAX AvFILLp 52# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif 54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
46 67
47#if defined(_WIN32) 68#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
49# undef setjmp 70# undef setjmp
50# undef longjmp 71# undef longjmp
95# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
96# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
97# endif 118# endif
98#endif 119#endif
99 120
121#if PERL_VERSION_ATLEAST(5,24,0)
122# define SUB_ARGARRAY PL_curpad[0]
123#else
124# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
125#endif
126
127/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
128#if 0
129# undef NDEBUG
130# include <assert.h>
131#endif
132
100static double (*nvtime)(); /* so why doesn't it take void? */ 133static double (*nvtime)(); /* so why doesn't it take void? */
101static void (*u2time)(pTHX_ UV ret[2]); 134static void (*u2time)(pTHX_ UV ret[2]);
102 135
103/* we hijack an hopefully unused CV flag for our purposes */ 136/* we hijack an hopefully unused CV flag for our purposes */
104#define CVf_SLF 0x4000 137#define CVf_SLF 0x4000
119 152
120static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
121static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
122static SV *rv_diehook; 155static SV *rv_diehook;
123static SV *rv_warnhook; 156static SV *rv_warnhook;
124static HV *hv_sig; /* %SIG */
125 157
126/* async_pool helper stuff */ 158/* async_pool helper stuff */
127static SV *sv_pool_rss; 159static SV *sv_pool_rss;
128static SV *sv_pool_size; 160static SV *sv_pool_size;
129static SV *sv_async_pool_idle; /* description string */ 161static SV *sv_async_pool_idle; /* description string */
235 SV *saved_deffh; 267 SV *saved_deffh;
236 SV *invoke_cb; 268 SV *invoke_cb;
237 AV *invoke_av; 269 AV *invoke_av;
238 270
239 /* on_enter/on_leave */ 271 /* on_enter/on_leave */
240 AV *on_enter; 272 AV *on_enter; AV *on_enter_xs;
241 AV *on_leave; 273 AV *on_leave; AV *on_leave_xs;
242 274
243 /* swap_sv */ 275 /* swap_sv */
244 AV *swap_sv; 276 AV *swap_sv;
245 277
246 /* times */ 278 /* times */
482 514
483 return 0; 515 return 0;
484} 516}
485 517
486ecb_inline struct coro * 518ecb_inline struct coro *
487SvSTATE_ (pTHX_ SV *coro) 519SvSTATE_ (pTHX_ SV *coro_sv)
488{ 520{
489 MAGIC *mg; 521 MAGIC *mg;
490 522
491 if (SvROK (coro)) 523 if (SvROK (coro_sv))
492 coro = SvRV (coro); 524 coro_sv = SvRV (coro_sv);
493 525
494 mg = SvSTATEhv_p (aTHX_ coro); 526 mg = SvSTATEhv_p (aTHX_ coro_sv);
495 if (!mg) 527 if (!mg)
496 croak ("Coro::State object required"); 528 croak ("Coro::State object required");
497 529
498 return (struct coro *)mg->mg_ptr; 530 return (struct coro *)mg->mg_ptr;
499} 531}
510ecb_inline PADLIST * 542ecb_inline PADLIST *
511coro_derive_padlist (pTHX_ CV *cv) 543coro_derive_padlist (pTHX_ CV *cv)
512{ 544{
513 PADLIST *padlist = CvPADLIST (cv); 545 PADLIST *padlist = CvPADLIST (cv);
514 PADLIST *newpadlist; 546 PADLIST *newpadlist;
547 PADNAMELIST *padnames;
515 PAD *newpad; 548 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1; 549 PADOFFSET off = PadlistMAX (padlist) + 1;
517 550
518 newPADLIST(newpadlist); 551#if NEWPADAPI
519#if !PERL_VERSION_ATLEAST(5,15,3) 552
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 553 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521 AvREAL_off (newpadlist); 554 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522#endif 555 while (!PadlistARRAY (padlist)[off - 1])
556 --off;
557
558 Perl_pad_push (aTHX_ padlist, off);
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistARRAY (padlist)[off] = 0;
562
563#else
564
523#if PERL_VERSION_ATLEAST (5,10,0) 565#if PERL_VERSION_ATLEAST (5,10,0)
524 Perl_pad_push (aTHX_ padlist, off); 566 Perl_pad_push (aTHX_ padlist, off);
525#else 567#else
526 Perl_pad_push (aTHX_ padlist, off, 1); 568 Perl_pad_push (aTHX_ padlist, off, 1);
527#endif 569#endif
570
528 newpad = PadlistARRAY (padlist)[off]; 571 newpad = PadlistARRAY (padlist)[off];
529 PadlistMAX (padlist) = off - 1; 572 PadlistMAX (padlist) = off - 1;
530 573
574#endif
575
576 newPADLIST (newpadlist);
577#if !PERL_VERSION_ATLEAST(5,15,3)
578 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
579 AvREAL_off (newpadlist);
580#endif
581
531 /* Already extended to 2 elements by newPADLIST. */ 582 /* Already extended to 2 elements by newPADLIST. */
532 PadlistMAX (newpadlist) = 1; 583 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 584
585 padnames = PadlistNAMES (padlist);
586 ++PadnamelistREFCNT (padnames);
587 PadlistNAMES (newpadlist) = padnames;
588
534 PadlistARRAY (newpadlist)[1] = newpad; 589 PadlistARRAY (newpadlist)[1] = newpad;
535 590
536 return newpadlist; 591 return newpadlist;
537} 592}
538 593
546 601
547 while (i > 0) /* special-case index 0 */ 602 while (i > 0) /* special-case index 0 */
548 { 603 {
549 /* we try to be extra-careful here */ 604 /* we try to be extra-careful here */
550 PAD *pad = PadlistARRAY (padlist)[i--]; 605 PAD *pad = PadlistARRAY (padlist)[i--];
606
607 if (pad)
608 {
551 I32 j = PadMAX (pad); 609 I32 j = PadMAX (pad);
552 610
553 while (j >= 0) 611 while (j >= 0)
554 SvREFCNT_dec (PadARRAY (pad)[j--]); 612 SvREFCNT_dec (PadARRAY (pad)[j--]);
555 613
556 PadMAX (pad) = -1; 614 PadMAX (pad) = -1;
557 SvREFCNT_dec (pad); 615 SvREFCNT_dec (pad);
616 }
558 } 617 }
559 618
560 SvREFCNT_dec (PadlistNAMES (padlist)); 619 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
561 620
562#ifdef NEWPADAPI 621#if NEWPADAPI
563 Safefree (PadlistARRAY (padlist)); 622 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist); 623 Safefree (padlist);
565#else 624#else
566 AvFILLp (padlist) = -1; 625 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist); 626 AvREAL_off (padlist);
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 720 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662 721
663 /* if SvANY points to the head, we need to adjust the pointers, 722 /* if SvANY points to the head, we need to adjust the pointers,
664 * as the pointer for a still points to b, and maybe vice versa. 723 * as the pointer for a still points to b, and maybe vice versa.
665 */ 724 */
666 #define svany_in_head(type) \ 725 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))) 726 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
727 svany_in_head_set |= 1 << SVt_NV;
728 #endif
729
730 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
668 731
669 if (svany_in_head (SvTYPE (a))) 732 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 733 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671 734
672 if (svany_in_head (SvTYPE (b))) 735 if (svany_in_head (SvTYPE (b)))
675#endif 738#endif
676} 739}
677 740
678/* swap sv heads, at least logically */ 741/* swap sv heads, at least logically */
679static void 742static void
680swap_svs (pTHX_ Coro__State c) 743swap_svs_enter (pTHX_ Coro__State c)
681{ 744{
682 int i; 745 int i;
683 746
684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 747 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
685 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 748 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
686} 749}
687 750
751static void
752swap_svs_leave (pTHX_ Coro__State c)
753{
754 int i;
755
756 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
757 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
758}
759
688#define SWAP_SVS(coro) \ 760#define SWAP_SVS_ENTER(coro) \
689 if (ecb_expect_false ((coro)->swap_sv)) \ 761 if (ecb_expect_false ((coro)->swap_sv)) \
690 swap_svs (aTHX_ (coro)) 762 swap_svs_enter (aTHX_ (coro))
763
764#define SWAP_SVS_LEAVE(coro) \
765 if (ecb_expect_false ((coro)->swap_sv)) \
766 swap_svs_leave (aTHX_ (coro))
691 767
692static void 768static void
693on_enterleave_call (pTHX_ SV *cb); 769on_enterleave_call (pTHX_ SV *cb);
694 770
695static void 771static void
740 816
741 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 817 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 818 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
743 } 819 }
744 820
821 if (ecb_expect_false (c->on_enter_xs))
822 {
823 int i;
824
825 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
826 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
827 }
828
745 SWAP_SVS (c); 829 SWAP_SVS_ENTER (c);
746} 830}
747 831
748static void 832static void
749save_perl (pTHX_ Coro__State c) 833save_perl (pTHX_ Coro__State c)
750{ 834{
751 SWAP_SVS (c); 835 SWAP_SVS_LEAVE (c);
836
837 if (ecb_expect_false (c->on_leave_xs))
838 {
839 int i;
840
841 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
842 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
843 }
752 844
753 if (ecb_expect_false (c->on_leave)) 845 if (ecb_expect_false (c->on_leave))
754 { 846 {
755 int i; 847 int i;
756 848
883#endif 975#endif
884 976
885 New(54,PL_savestack,24,ANY); 977 New(54,PL_savestack,24,ANY);
886 PL_savestack_ix = 0; 978 PL_savestack_ix = 0;
887 PL_savestack_max = 24; 979 PL_savestack_max = 24;
980#if PERL_VERSION_ATLEAST (5,24,0)
981 /* perl 5.24 moves SS_MAXPUSH optimisation from */
982 /* the header macros to PL_savestack_max */
983 PL_savestack_max -= SS_MAXPUSH;
984#endif
888 985
889#if !PERL_VERSION_ATLEAST (5,10,0) 986#if !PERL_VERSION_ATLEAST (5,10,0)
890 New(54,PL_retstack,4,OP*); 987 New(54,PL_retstack,4,OP*);
891 PL_retstack_ix = 0; 988 PL_retstack_ix = 0;
892 PL_retstack_max = 4; 989 PL_retstack_max = 4;
958 } 1055 }
959 1056
960 return rss; 1057 return rss;
961} 1058}
962 1059
963/** coroutine stack handling ************************************************/ 1060/** 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 1061
969/* apparently < 5.8.8 */ 1062/* apparently < 5.8.8 */
970#ifndef MgPV_nolen_const 1063#ifndef MgPV_nolen_const
971#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1064#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
972 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1065 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
973 (const char*)(mg)->mg_ptr) 1066 (const char*)(mg)->mg_ptr)
974#endif 1067#endif
1068
1069/* this will be a patched copy of PL_vtbl_sigelem */
1070static MGVTBL coro_sigelem_vtbl;
1071
1072static int ecb_cold
1073coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1074{
1075 char *key = SvPV_nolen ((SV *)name);
1076
1077 /* do what mg_copy normally does */
1078 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1079 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1080
1081 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1082 if (*key == '_'
1083 && (strEQ (key, "__DIE__")
1084 || strEQ (key, "__WARN__")))
1085 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1086
1087 return 1;
1088}
1089
1090/* perl does not have a %SIG vtbl, we provide one so we can override */
1091/* the magic vtbl for the __DIE__ and __WARN__ members */
1092static const MGVTBL coro_sig_vtbl = {
1093 0, 0, 0, 0, 0,
1094 coro_sig_copy
1095};
975 1096
976/* 1097/*
977 * This overrides the default magic get method of %SIG elements. 1098 * 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 1099 * 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), 1100 * and instead of trying to save and restore the hash elements (extremely slow),
981 */ 1102 */
982static int ecb_cold 1103static int ecb_cold
983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1104coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
984{ 1105{
985 const char *s = MgPV_nolen_const (mg); 1106 const char *s = MgPV_nolen_const (mg);
1107 /* the key must be either __DIE__ or __WARN__ here */
1108 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
986 1109
987 if (*s == '_') 1110 SV *ssv;
988 {
989 SV **svp = 0;
990 1111
991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
993
994 if (svp) 1112 if (!*svp)
995 {
996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef; 1113 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1114 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp)); 1115 ssv = sv_2mortal (newRV_inc (*svp));
1002 else 1116 else
1003 ssv = *svp; 1117 ssv = *svp;
1004 1118
1005 sv_setsv (sv, ssv); 1119 sv_setsv (sv, ssv);
1006 return 0; 1120 return 0;
1007 }
1008 }
1009
1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1011} 1121}
1012 1122
1013static int ecb_cold 1123static int ecb_cold
1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1124coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1015{ 1125{
1016 const char *s = MgPV_nolen_const (mg); 1126 const char *s = MgPV_nolen_const (mg);
1127 /* the key must be either __DIE__ or __WARN__ here */
1128 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1017 1129
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; 1130 SV *old = *svp;
1028 *svp = 0; 1131 *svp = 0;
1029 SvREFCNT_dec (old); 1132 SvREFCNT_dec (old);
1030 return 0; 1133 return 0;
1031 }
1032 }
1033
1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1035} 1134}
1036 1135
1037static int ecb_cold 1136static int ecb_cold
1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1137coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1039{ 1138{
1040 const char *s = MgPV_nolen_const (mg); 1139 const char *s = MgPV_nolen_const (mg);
1140 /* the key must be either __DIE__ or __WARN__ here */
1141 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1041 1142
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; 1143 SV *old = *svp;
1052 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1144 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1053 SvREFCNT_dec (old); 1145 SvREFCNT_dec (old);
1054 return 0; 1146 return 0;
1055 }
1056 }
1057
1058 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1059} 1147}
1060 1148
1061static void 1149static void
1062prepare_nop (pTHX_ struct coro_transfer_args *ta) 1150prepare_nop (pTHX_ struct coro_transfer_args *ta)
1063{ 1151{
1074static int 1162static int
1075slf_check_repeat (pTHX_ struct CoroSLF *frame) 1163slf_check_repeat (pTHX_ struct CoroSLF *frame)
1076{ 1164{
1077 return 1; 1165 return 1;
1078} 1166}
1167
1168/** coroutine stack handling ************************************************/
1079 1169
1080static UNOP init_perl_op; 1170static UNOP init_perl_op;
1081 1171
1082ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1172ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1083init_perl (pTHX_ struct coro *coro) 1173init_perl (pTHX_ struct coro *coro)
1109 1199
1110 GvSV (PL_defgv) = newSV (0); 1200 GvSV (PL_defgv) = newSV (0);
1111 GvAV (PL_defgv) = coro->args; coro->args = 0; 1201 GvAV (PL_defgv) = coro->args; coro->args = 0;
1112 GvSV (PL_errgv) = newSV (0); 1202 GvSV (PL_errgv) = newSV (0);
1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1203 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1114 GvHV (PL_hintgv) = 0; 1204 GvHV (PL_hintgv) = newHV ();
1205#if PERL_VERSION_ATLEAST (5,10,0)
1206 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1207#endif
1115 PL_rs = newSVsv (GvSV (irsgv)); 1208 PL_rs = newSVsv (GvSV (irsgv));
1116 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1209 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1117 1210
1118 { 1211 {
1119 dSP; 1212 dSP;
1147 PL_op = (OP *)&init_perl_op; 1240 PL_op = (OP *)&init_perl_op;
1148 1241
1149 /* copy throw, in case it was set before init_perl */ 1242 /* copy throw, in case it was set before init_perl */
1150 CORO_THROW = coro->except; 1243 CORO_THROW = coro->except;
1151 1244
1152 SWAP_SVS (coro); 1245 SWAP_SVS_ENTER (coro);
1153 1246
1154 if (ecb_expect_false (enable_times)) 1247 if (ecb_expect_false (enable_times))
1155 { 1248 {
1156 coro_times_update (); 1249 coro_times_update ();
1157 coro_times_sub (coro); 1250 coro_times_sub (coro);
1195 /* this will cause transfer_check to croak on block*/ 1288 /* this will cause transfer_check to croak on block*/
1196 SvRV_set (coro_current, (SV *)coro->hv); 1289 SvRV_set (coro_current, (SV *)coro->hv);
1197 1290
1198 load_perl (aTHX_ coro); 1291 load_perl (aTHX_ coro);
1199 1292
1293 /* restore swapped sv's */
1294 SWAP_SVS_LEAVE (coro);
1295
1200 coro_unwind_stacks (aTHX); 1296 coro_unwind_stacks (aTHX);
1201
1202 /* restore swapped sv's */
1203 SWAP_SVS (coro);
1204 1297
1205 coro_destruct_stacks (aTHX); 1298 coro_destruct_stacks (aTHX);
1206 1299
1207 /* now save some sv's to be free'd later */ 1300 /* now save some sv's to be free'd later */
1208 svf [0] = GvSV (PL_defgv); 1301 svf [0] = GvSV (PL_defgv);
1229 1322
1230 SvREFCNT_dec (coro->saved_deffh); 1323 SvREFCNT_dec (coro->saved_deffh);
1231 SvREFCNT_dec (coro->rouse_cb); 1324 SvREFCNT_dec (coro->rouse_cb);
1232 SvREFCNT_dec (coro->invoke_cb); 1325 SvREFCNT_dec (coro->invoke_cb);
1233 SvREFCNT_dec (coro->invoke_av); 1326 SvREFCNT_dec (coro->invoke_av);
1327 SvREFCNT_dec (coro->on_enter_xs);
1328 SvREFCNT_dec (coro->on_leave_xs);
1234 } 1329 }
1235} 1330}
1236 1331
1237ecb_inline void 1332ecb_inline void
1238free_coro_mortal (pTHX) 1333free_coro_mortal (pTHX)
1301 1396
1302 if (PL_curcop != &PL_compiling) 1397 if (PL_curcop != &PL_compiling)
1303 { 1398 {
1304 SV **cb; 1399 SV **cb;
1305 1400
1306 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1401 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1307 { 1402 {
1308 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1403 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1309 1404
1310 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1405 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1311 { 1406 {
1321 SAVETMPS; 1416 SAVETMPS;
1322 EXTEND (SP, 3); 1417 EXTEND (SP, 3);
1323 PUSHMARK (SP); 1418 PUSHMARK (SP);
1324 PUSHs (&PL_sv_yes); 1419 PUSHs (&PL_sv_yes);
1325 PUSHs (fullname); 1420 PUSHs (fullname);
1326 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1421 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1327 PUTBACK; 1422 PUTBACK;
1328 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1423 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1329 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1424 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1330 SPAGAIN; 1425 SPAGAIN;
1331 FREETMPS; 1426 FREETMPS;
1453 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1548 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1454 * runtime errors here, as this is just a random interpreter, not a thread. 1549 * runtime errors here, as this is just a random interpreter, not a thread.
1455 */ 1550 */
1456 1551
1457 /* 1552 /*
1553 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1554 * requires PL_scopestack_ix, so do it here if required.
1555 */
1556 if (!PL_scopestack_ix)
1557 ENTER;
1558
1559 /*
1458 * If perl-run returns we assume exit() was being called or the coro 1560 * If perl-run returns we assume exit() was being called or the coro
1459 * fell off the end, which seems to be the only valid (non-bug) 1561 * fell off the end, which seems to be the only valid (non-bug)
1460 * reason for perl_run to return. We try to mimic whatever perl is normally 1562 * reason for perl_run to return. We try to mimic whatever perl is normally
1461 * doing in that case. YMMV. 1563 * doing in that case. YMMV.
1462 */ 1564 */
1888 /* nothing to schedule: call the idle handler */ 1990 /* nothing to schedule: call the idle handler */
1889 if (SvROK (sv_idle) 1991 if (SvROK (sv_idle)
1890 && SvOBJECT (SvRV (sv_idle))) 1992 && SvOBJECT (SvRV (sv_idle)))
1891 { 1993 {
1892 if (SvRV (sv_idle) == SvRV (coro_current)) 1994 if (SvRV (sv_idle) == SvRV (coro_current))
1995 {
1996 require_pv ("Carp");
1997
1998 {
1999 dSP;
2000
2001 ENTER;
2002 SAVETMPS;
2003
2004 PUSHMARK (SP);
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2005 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2006 PUTBACK;
2007 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2008
2009 FREETMPS;
2010 LEAVE;
2011 }
2012 }
1894 2013
1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2014 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1896 api_ready (aTHX_ SvRV (sv_idle)); 2015 api_ready (aTHX_ SvRV (sv_idle));
1897 --coro_nready; 2016 --coro_nready;
1898 } 2017 }
2202 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2321 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2203 } 2322 }
2204 else 2323 else
2205 { 2324 {
2206 struct coro *self = SvSTATE_current; 2325 struct coro *self = SvSTATE_current;
2326
2327 if (!self)
2328 croak ("Coro::cancel called outside of thread content,");
2207 2329
2208 /* otherwise we cancel directly, purely for speed reasons 2330 /* otherwise we cancel directly, purely for speed reasons
2209 * unfortunately, this requires some magic trickery, as 2331 * unfortunately, this requires some magic trickery, as
2210 * somebody else could cancel us, so we have to fight the cancellation. 2332 * somebody else could cancel us, so we have to fight the cancellation.
2211 * this is ugly, and hopefully fully worth the extra speed. 2333 * this is ugly, and hopefully fully worth the extra speed.
2321 else 2443 else
2322 { 2444 {
2323 av_clear (GvAV (PL_defgv)); 2445 av_clear (GvAV (PL_defgv));
2324 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2446 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2325 2447
2448 if (ecb_expect_false (coro->swap_sv))
2449 {
2450 SWAP_SVS_LEAVE (coro);
2451 SvREFCNT_dec_NN (coro->swap_sv);
2452 coro->swap_sv = 0;
2453 }
2454
2326 coro->prio = 0; 2455 coro->prio = 0;
2327 2456
2328 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2457 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2329 api_trace (aTHX_ coro_current, 0); 2458 api_trace (aTHX_ coro_current, 0);
2330 2459
2331 frame->prepare = prepare_schedule; 2460 frame->prepare = prepare_schedule;
2332 av_push (av_async_pool, SvREFCNT_inc (hv)); 2461 av_push (av_async_pool, SvREFCNT_inc (hv));
2333 } 2462 }
2553 2682
2554/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2683/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2555static void 2684static void
2556slf_destroy (pTHX_ struct coro *coro) 2685slf_destroy (pTHX_ struct coro *coro)
2557{ 2686{
2558 /* this callback is reserved for slf functions needing to do cleanup */ 2687 struct CoroSLF frame = coro->slf_frame;
2559 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2560 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2561 2688
2562 /* 2689 /*
2563 * The on_destroy above most likely is from an SLF call. 2690 * The on_destroy below most likely is from an SLF call.
2564 * Since by definition the SLF call will not finish when we destroy 2691 * Since by definition the SLF call will not finish when we destroy
2565 * the coro, we will have to force-finish it here, otherwise 2692 * the coro, we will have to force-finish it here, otherwise
2566 * cleanup functions cannot call SLF functions. 2693 * cleanup functions cannot call SLF functions.
2567 */ 2694 */
2568 coro->slf_frame.prepare = 0; 2695 coro->slf_frame.prepare = 0;
2696
2697 /* this callback is reserved for slf functions needing to do cleanup */
2698 if (frame.destroy && frame.prepare && !PL_dirty)
2699 frame.destroy (aTHX_ &frame);
2569} 2700}
2570 2701
2571/* 2702/*
2572 * these not obviously related functions are all rolled into one 2703 * these not obviously related functions are all rolled into one
2573 * function to increase chances that they all will call transfer with the same 2704 * function to increase chances that they all will call transfer with the same
2756static void 2887static void
2757coro_pop_on_leave (pTHX_ void *coro) 2888coro_pop_on_leave (pTHX_ void *coro)
2758{ 2889{
2759 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2890 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2760 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2891 on_enterleave_call (aTHX_ sv_2mortal (cb));
2892}
2893
2894static void
2895enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2896{
2897 if (!hook)
2898 return;
2899
2900 if (!*avp)
2901 {
2902 *avp = newAV ();
2903 AvREAL_off (*avp);
2904 }
2905
2906 av_push (*avp, (SV *)hook);
2907 av_push (*avp, (SV *)arg);
2908}
2909
2910static void
2911enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2912{
2913 AV *av = *avp;
2914 int i;
2915
2916 if (!av)
2917 return;
2918
2919 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2920 if (AvARRAY (av)[i] == (SV *)hook)
2921 {
2922 if (execute)
2923 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2924
2925 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2926 av_pop (av);
2927 av_pop (av);
2928 break;
2929 }
2930
2931 if (AvFILLp (av) >= 0)
2932 {
2933 *avp = 0;
2934 SvREFCNT_dec_NN (av);
2935 }
2936}
2937
2938static void
2939api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2940{
2941 struct coro *coro = SvSTATE (coro_sv);
2942
2943 if (SvSTATE_current == coro)
2944 if (enter)
2945 enter (aTHX_ enter_arg);
2946
2947 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2948 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2949}
2950
2951static void
2952api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE (coro_sv);
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2957 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2958}
2959
2960static void
2961savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2962{
2963 struct coro *coro = SvSTATE_current;
2964
2965 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2966}
2967
2968static void
2969savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2970{
2971 struct coro *coro = SvSTATE_current;
2972
2973 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2974}
2975
2976static void
2977api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2978{
2979 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2980
2981 /* this ought to be much cheaper than malloc + a single destructor call */
2982 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2983 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2761} 2984}
2762 2985
2763/*****************************************************************************/ 2986/*****************************************************************************/
2764/* PerlIO::cede */ 2987/* PerlIO::cede */
2765 2988
2895 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3118 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2896 PUTBACK; 3119 PUTBACK;
2897 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3120 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2898 } 3121 }
2899 3122
2900 SvREFCNT_dec (cb); 3123 SvREFCNT_dec_NN (cb);
2901 } 3124 }
2902} 3125}
2903 3126
2904static void 3127static void
2905coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3128coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2913{ 3136{
2914 AV *av = (AV *)frame->data; 3137 AV *av = (AV *)frame->data;
2915 SV *count_sv = AvARRAY (av)[0]; 3138 SV *count_sv = AvARRAY (av)[0];
2916 SV *coro_hv = SvRV (coro_current); 3139 SV *coro_hv = SvRV (coro_current);
2917 3140
3141 frame->destroy = 0;
3142
2918 /* if we are about to throw, don't actually acquire the lock, just throw */ 3143 /* if we are about to throw, don't actually acquire the lock, just throw */
2919 if (CORO_THROW) 3144 if (ecb_expect_false (CORO_THROW))
3145 {
3146 /* we still might be responsible for the semaphore, so wake up others */
3147 coro_semaphore_adjust (aTHX_ av, 0);
3148
2920 return 0; 3149 return 0;
3150 }
2921 else if (SvIVX (count_sv) > 0) 3151 else if (SvIVX (count_sv) > 0)
2922 { 3152 {
2923 frame->destroy = 0;
2924
2925 if (acquire) 3153 if (acquire)
2926 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3154 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2927 else 3155 else
2928 coro_semaphore_adjust (aTHX_ av, 0); 3156 coro_semaphore_adjust (aTHX_ av, 0);
2929 3157
3040 { 3268 {
3041 api_ready (aTHX_ cb); 3269 api_ready (aTHX_ cb);
3042 sv_setiv (cb, 0); /* signal waiter */ 3270 sv_setiv (cb, 0); /* signal waiter */
3043 } 3271 }
3044 3272
3045 SvREFCNT_dec (cb); 3273 SvREFCNT_dec_NN (cb);
3046 3274
3047 --count; 3275 --count;
3048 } 3276 }
3049} 3277}
3050 3278
3135 } 3363 }
3136 3364
3137 av_push (state, data_sv); 3365 av_push (state, data_sv);
3138 3366
3139 api_ready (aTHX_ coro); 3367 api_ready (aTHX_ coro);
3140 SvREFCNT_dec (coro); 3368 SvREFCNT_dec_NN (coro);
3141 SvREFCNT_dec ((AV *)state); 3369 SvREFCNT_dec_NN ((AV *)state);
3142} 3370}
3143 3371
3144static int 3372static int
3145slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3373slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3146{ 3374{
3164 errno = data->errorno; 3392 errno = data->errorno;
3165 PL_laststype = data->laststype; 3393 PL_laststype = data->laststype;
3166 PL_laststatval = data->laststatval; 3394 PL_laststatval = data->laststatval;
3167 PL_statcache = data->statcache; 3395 PL_statcache = data->statcache;
3168 3396
3169 SvREFCNT_dec (data_sv); 3397 SvREFCNT_dec_NN (data_sv);
3170 } 3398 }
3171 3399
3172 /* push result values */ 3400 /* push result values */
3173 { 3401 {
3174 dSP; 3402 dSP;
3363 3591
3364 map_len = load_len + save_len + 16; 3592 map_len = load_len + save_len + 16;
3365 3593
3366 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3594 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3367 3595
3596 if (map_base == (char *)MAP_FAILED)
3597 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3598
3368 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3599 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3369 3600
3370 load_perl_slots = (load_save_perl_slots_type)map_base; 3601 load_perl_slots = (load_save_perl_slots_type)map_base;
3371 memcpy (map_base, load_ptr, load_len); 3602 memcpy (map_base, load_ptr, load_len);
3372 3603
3389 3620
3390PROTOTYPES: DISABLE 3621PROTOTYPES: DISABLE
3391 3622
3392BOOT: 3623BOOT:
3393{ 3624{
3625#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3626#include "state.h"
3394#ifdef USE_ITHREADS 3627#ifdef USE_ITHREADS
3395# if CORO_PTHREAD 3628# if CORO_PTHREAD
3396 coro_thx = PERL_GET_CONTEXT; 3629 coro_thx = PERL_GET_CONTEXT;
3397# endif 3630# endif
3398#endif 3631#endif
3406 cctx_current = cctx_new_empty (); 3639 cctx_current = cctx_new_empty ();
3407 3640
3408 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3641 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3409 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3642 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3410 3643
3411 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3644 {
3412 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3645 /*
3413 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3646 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3647 * by coro_sig_vtbl in hash values.
3648 */
3649 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3650
3651 /* this only works if perl doesn't have a vtbl for %SIG */
3652 assert (!mg->mg_virtual);
3653
3654 /*
3655 * The irony is that the perl API itself asserts that mg_virtual
3656 * must be non-const, yet perl5porters insisted on marking their
3657 * vtbls as read-only, just to thwart perl modules from patching
3658 * them.
3659 */
3660 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3661 mg->mg_flags |= MGf_COPY;
3662
3663 coro_sigelem_vtbl = PL_vtbl_sigelem;
3664 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3665 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3666 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3667 }
3414 3668
3415 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3416 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3669 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3417 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3418 3671
3419 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3420 3673
3726 if (ecb_expect_false (current == self)) 3979 if (ecb_expect_false (current == self))
3727 coro_times_sub (SvSTATE (coro_current)); 3980 coro_times_sub (SvSTATE (coro_current));
3728} 3981}
3729 3982
3730void 3983void
3731swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3984swap_sv (Coro::State coro, SV *sva, SV *svb)
3732 CODE: 3985 CODE:
3733{ 3986{
3734 struct coro *current = SvSTATE_current; 3987 struct coro *current = SvSTATE_current;
3988 AV *swap_sv;
3989 int i;
3990
3991 sva = SvRV (sva);
3992 svb = SvRV (svb);
3735 3993
3736 if (current == coro) 3994 if (current == coro)
3737 SWAP_SVS (current); 3995 SWAP_SVS_LEAVE (current);
3738 3996
3739 if (!coro->swap_sv) 3997 if (!coro->swap_sv)
3740 coro->swap_sv = newAV (); 3998 coro->swap_sv = newAV ();
3741 3999
4000 swap_sv = coro->swap_sv;
4001
4002 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4003 {
4004 SV *a = AvARRAY (swap_sv)[i ];
4005 SV *b = AvARRAY (swap_sv)[i + 1];
4006
4007 if (a == sva && b == svb)
4008 {
4009 SvREFCNT_dec_NN (a);
4010 SvREFCNT_dec_NN (b);
4011
4012 for (; i <= AvFILLp (swap_sv) - 2; i++)
4013 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4014
4015 AvFILLp (swap_sv) -= 2;
4016
4017 goto removed;
4018 }
4019 }
4020
3742 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4021 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3743 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4022 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4023
4024 removed:
3744 4025
3745 if (current == coro) 4026 if (current == coro)
3746 SWAP_SVS (current); 4027 SWAP_SVS_ENTER (current);
3747} 4028}
3748 4029
3749 4030
3750MODULE = Coro::State PACKAGE = Coro 4031MODULE = Coro::State PACKAGE = Coro
3751 4032
3752BOOT: 4033BOOT:
3753{ 4034{
4035 if (SVt_LAST > 32)
4036 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4037
3754 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4038 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3755 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4039 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3756 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4040 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3757 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4041 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3758 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4042 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3784 coroapi.ready = api_ready; 4068 coroapi.ready = api_ready;
3785 coroapi.is_ready = api_is_ready; 4069 coroapi.is_ready = api_is_ready;
3786 coroapi.nready = coro_nready; 4070 coroapi.nready = coro_nready;
3787 coroapi.current = coro_current; 4071 coroapi.current = coro_current;
3788 4072
4073 coroapi.enterleave_hook = api_enterleave_hook;
4074 coroapi.enterleave_unhook = api_enterleave_unhook;
4075 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4076
3789 /*GCoroAPI = &coroapi;*/ 4077 /*GCoroAPI = &coroapi;*/
3790 sv_setiv (sv, (IV)&coroapi); 4078 sv_setiv (sv, (IV)&coroapi);
3791 SvREADONLY_on (sv); 4079 SvREADONLY_on (sv);
3792 } 4080 }
3793} 4081}
3858 4146
3859void 4147void
3860_set_current (SV *current) 4148_set_current (SV *current)
3861 PROTOTYPE: $ 4149 PROTOTYPE: $
3862 CODE: 4150 CODE:
3863 SvREFCNT_dec (SvRV (coro_current)); 4151 SvREFCNT_dec_NN (SvRV (coro_current));
3864 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4152 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3865 4153
3866void 4154void
3867_set_readyhook (SV *hook) 4155_set_readyhook (SV *hook)
3868 PROTOTYPE: $ 4156 PROTOTYPE: $
3952 4240
3953 if ((SV *)hv == &PL_sv_undef) 4241 if ((SV *)hv == &PL_sv_undef)
3954 { 4242 {
3955 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4243 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3956 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4244 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3957 SvREFCNT_dec (sv); 4245 SvREFCNT_dec_NN (sv);
3958 } 4246 }
3959 4247
3960 { 4248 {
3961 struct coro *coro = SvSTATE_hv (hv); 4249 struct coro *coro = SvSTATE_hv (hv);
3962 4250
3969 api_ready (aTHX_ (SV *)hv); 4257 api_ready (aTHX_ (SV *)hv);
3970 4258
3971 if (GIMME_V != G_VOID) 4259 if (GIMME_V != G_VOID)
3972 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4260 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3973 else 4261 else
3974 SvREFCNT_dec (hv); 4262 SvREFCNT_dec_NN (hv);
3975} 4263}
3976 4264
3977SV * 4265SV *
3978rouse_cb () 4266rouse_cb ()
3979 PROTOTYPE: 4267 PROTOTYPE:
4058 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4346 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4059 OUTPUT: 4347 OUTPUT:
4060 RETVAL 4348 RETVAL
4061 4349
4062void 4350void
4063up (SV *self, int adjust = 1) 4351up (SV *self)
4064 ALIAS:
4065 adjust = 1
4066 CODE: 4352 CODE:
4353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4354
4355void
4356adjust (SV *self, int adjust)
4357 CODE:
4067 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4068 4359
4069void 4360void
4070down (...) 4361down (...)
4071 CODE: 4362 CODE:
4072 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4363 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines