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.432 by root, Wed May 8 00:44:44 2013 UTC vs.
Revision 1.467 by root, Sun Jun 26 21:46:03 2016 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/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
122#if 0
123# undef NDEBUG
124# include <assert.h>
125#endif
126
100static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
101static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
102 129
103/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
104#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
119 146
120static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
121static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
122static SV *rv_diehook; 149static SV *rv_diehook;
123static SV *rv_warnhook; 150static SV *rv_warnhook;
124static HV *hv_sig; /* %SIG */
125 151
126/* async_pool helper stuff */ 152/* async_pool helper stuff */
127static SV *sv_pool_rss; 153static SV *sv_pool_rss;
128static SV *sv_pool_size; 154static SV *sv_pool_size;
129static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
235 SV *saved_deffh; 261 SV *saved_deffh;
236 SV *invoke_cb; 262 SV *invoke_cb;
237 AV *invoke_av; 263 AV *invoke_av;
238 264
239 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
240 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
241 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
242 268
243 /* swap_sv */ 269 /* swap_sv */
244 AV *swap_sv; 270 AV *swap_sv;
245 271
246 /* times */ 272 /* times */
482 508
483 return 0; 509 return 0;
484} 510}
485 511
486ecb_inline struct coro * 512ecb_inline struct coro *
487SvSTATE_ (pTHX_ SV *coro) 513SvSTATE_ (pTHX_ SV *coro_sv)
488{ 514{
489 MAGIC *mg; 515 MAGIC *mg;
490 516
491 if (SvROK (coro)) 517 if (SvROK (coro_sv))
492 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
493 519
494 mg = SvSTATEhv_p (aTHX_ coro); 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
495 if (!mg) 521 if (!mg)
496 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
497 523
498 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
499} 525}
510ecb_inline PADLIST * 536ecb_inline PADLIST *
511coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
512{ 538{
513 PADLIST *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
514 PADLIST *newpadlist; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
515 PAD *newpad; 542 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1; 543 PADOFFSET off = PadlistMAX (padlist) + 1;
517 544
518 newPADLIST(newpadlist); 545#if NEWPADAPI
519#if !PERL_VERSION_ATLEAST(5,15,3) 546
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 547 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521 AvREAL_off (newpadlist); 548 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522#endif 549 while (!PadlistARRAY (padlist)[off - 1])
550 --off;
551
552 Perl_pad_push (aTHX_ padlist, off);
553
554 newpad = PadlistARRAY (padlist)[off];
555 PadlistARRAY (padlist)[off] = 0;
556
557#else
558
523#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
524 Perl_pad_push (aTHX_ padlist, off); 560 Perl_pad_push (aTHX_ padlist, off);
525#else 561#else
526 Perl_pad_push (aTHX_ padlist, off, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
527#endif 563#endif
564
528 newpad = PadlistARRAY (padlist)[off]; 565 newpad = PadlistARRAY (padlist)[off];
529 PadlistMAX (padlist) = off - 1; 566 PadlistMAX (padlist) = off - 1;
530 567
568#endif
569
570 newPADLIST (newpadlist);
571#if !PERL_VERSION_ATLEAST(5,15,3)
572 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
573 AvREAL_off (newpadlist);
574#endif
575
531 /* Already extended to 2 elements by newPADLIST. */ 576 /* Already extended to 2 elements by newPADLIST. */
532 PadlistMAX (newpadlist) = 1; 577 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
534 PadlistARRAY (newpadlist)[1] = newpad; 583 PadlistARRAY (newpadlist)[1] = newpad;
535 584
536 return newpadlist; 585 return newpadlist;
537} 586}
538 587
546 595
547 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
548 { 597 {
549 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
550 PAD *pad = PadlistARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
600
601 if (pad)
602 {
551 I32 j = PadMAX (pad); 603 I32 j = PadMAX (pad);
552 604
553 while (j >= 0) 605 while (j >= 0)
554 SvREFCNT_dec (PadARRAY (pad)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
555 607
556 PadMAX (pad) = -1; 608 PadMAX (pad) = -1;
557 SvREFCNT_dec (pad); 609 SvREFCNT_dec (pad);
610 }
558 } 611 }
559 612
560 SvREFCNT_dec (PadlistNAMES (padlist)); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
561 614
562#ifdef NEWPADAPI 615#if NEWPADAPI
563 Safefree (PadlistARRAY (padlist)); 616 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist); 617 Safefree (padlist);
565#else 618#else
566 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist); 620 AvREAL_off (padlist);
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 714 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662 715
663 /* if SvANY points to the head, we need to adjust the pointers, 716 /* 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. 717 * as the pointer for a still points to b, and maybe vice versa.
665 */ 718 */
666 #define svany_in_head(type) \ 719 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))) 720 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
721 svany_in_head_set |= 1 << SVt_NV;
722 #endif
723
724 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
668 725
669 if (svany_in_head (SvTYPE (a))) 726 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671 728
672 if (svany_in_head (SvTYPE (b))) 729 if (svany_in_head (SvTYPE (b)))
675#endif 732#endif
676} 733}
677 734
678/* swap sv heads, at least logically */ 735/* swap sv heads, at least logically */
679static void 736static void
680swap_svs (pTHX_ Coro__State c) 737swap_svs_enter (pTHX_ Coro__State c)
681{ 738{
682 int i; 739 int i;
683 740
684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
685 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 742 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
686} 743}
687 744
745static void
746swap_svs_leave (pTHX_ Coro__State c)
747{
748 int i;
749
750 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
751 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
752}
753
688#define SWAP_SVS(coro) \ 754#define SWAP_SVS_ENTER(coro) \
689 if (ecb_expect_false ((coro)->swap_sv)) \ 755 if (ecb_expect_false ((coro)->swap_sv)) \
690 swap_svs (aTHX_ (coro)) 756 swap_svs_enter (aTHX_ (coro))
757
758#define SWAP_SVS_LEAVE(coro) \
759 if (ecb_expect_false ((coro)->swap_sv)) \
760 swap_svs_leave (aTHX_ (coro))
691 761
692static void 762static void
693on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
694 764
695static void 765static void
740 810
741 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
743 } 813 }
744 814
815 if (ecb_expect_false (c->on_enter_xs))
816 {
817 int i;
818
819 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
820 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
821 }
822
745 SWAP_SVS (c); 823 SWAP_SVS_ENTER (c);
746} 824}
747 825
748static void 826static void
749save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
750{ 828{
751 SWAP_SVS (c); 829 SWAP_SVS_LEAVE (c);
830
831 if (ecb_expect_false (c->on_leave_xs))
832 {
833 int i;
834
835 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
836 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
837 }
752 838
753 if (ecb_expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
754 { 840 {
755 int i; 841 int i;
756 842
883#endif 969#endif
884 970
885 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
886 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
887 PL_savestack_max = 24; 973 PL_savestack_max = 24;
974#if PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH;
978#endif
888 979
889#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
890 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
891 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
892 PL_retstack_max = 4; 983 PL_retstack_max = 4;
958 } 1049 }
959 1050
960 return rss; 1051 return rss;
961} 1052}
962 1053
963/** coroutine stack handling ************************************************/ 1054/** 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 1055
969/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
970#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
971#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
972 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
973 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
974#endif 1061#endif
1062
1063/* this will be a patched copy of PL_vtbl_sigelem */
1064static MGVTBL coro_sigelem_vtbl;
1065
1066static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{
1069 char *key = SvPV_nolen ((SV *)name);
1070
1071 /* do what mg_copy normally does */
1072 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1073 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1074
1075 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1076 if (*key == '_'
1077 && (strEQ (key, "__DIE__")
1078 || strEQ (key, "__WARN__")))
1079 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1080
1081 return 1;
1082}
1083
1084/* perl does not have a %SIG vtbl, we provide one so we can override */
1085/* the magic vtbl for the __DIE__ and __WARN__ members */
1086static const MGVTBL coro_sig_vtbl = {
1087 0, 0, 0, 0, 0,
1088 coro_sig_copy
1089};
975 1090
976/* 1091/*
977 * This overrides the default magic get method of %SIG elements. 1092 * 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 1093 * 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), 1094 * and instead of trying to save and restore the hash elements (extremely slow),
981 */ 1096 */
982static int ecb_cold 1097static int ecb_cold
983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1098coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
984{ 1099{
985 const char *s = MgPV_nolen_const (mg); 1100 const char *s = MgPV_nolen_const (mg);
1101 /* the key must be either __DIE__ or __WARN__ here */
1102 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
986 1103
987 if (*s == '_') 1104 SV *ssv;
988 {
989 SV **svp = 0;
990 1105
991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
993
994 if (svp) 1106 if (!*svp)
995 {
996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef; 1107 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1108 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp)); 1109 ssv = sv_2mortal (newRV_inc (*svp));
1002 else 1110 else
1003 ssv = *svp; 1111 ssv = *svp;
1004 1112
1005 sv_setsv (sv, ssv); 1113 sv_setsv (sv, ssv);
1006 return 0; 1114 return 0;
1007 }
1008 }
1009
1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1011} 1115}
1012 1116
1013static int ecb_cold 1117static int ecb_cold
1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1015{ 1119{
1016 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
1121 /* the key must be either __DIE__ or __WARN__ here */
1122 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1017 1123
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; 1124 SV *old = *svp;
1028 *svp = 0; 1125 *svp = 0;
1029 SvREFCNT_dec (old); 1126 SvREFCNT_dec (old);
1030 return 0; 1127 return 0;
1031 }
1032 }
1033
1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1035} 1128}
1036 1129
1037static int ecb_cold 1130static int ecb_cold
1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1131coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1039{ 1132{
1040 const char *s = MgPV_nolen_const (mg); 1133 const char *s = MgPV_nolen_const (mg);
1134 /* the key must be either __DIE__ or __WARN__ here */
1135 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1041 1136
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; 1137 SV *old = *svp;
1052 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1138 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1053 SvREFCNT_dec (old); 1139 SvREFCNT_dec (old);
1054 return 0; 1140 return 0;
1055 }
1056 }
1057
1058 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1059} 1141}
1060 1142
1061static void 1143static void
1062prepare_nop (pTHX_ struct coro_transfer_args *ta) 1144prepare_nop (pTHX_ struct coro_transfer_args *ta)
1063{ 1145{
1074static int 1156static int
1075slf_check_repeat (pTHX_ struct CoroSLF *frame) 1157slf_check_repeat (pTHX_ struct CoroSLF *frame)
1076{ 1158{
1077 return 1; 1159 return 1;
1078} 1160}
1161
1162/** coroutine stack handling ************************************************/
1079 1163
1080static UNOP init_perl_op; 1164static UNOP init_perl_op;
1081 1165
1082ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1166ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1083init_perl (pTHX_ struct coro *coro) 1167init_perl (pTHX_ struct coro *coro)
1109 1193
1110 GvSV (PL_defgv) = newSV (0); 1194 GvSV (PL_defgv) = newSV (0);
1111 GvAV (PL_defgv) = coro->args; coro->args = 0; 1195 GvAV (PL_defgv) = coro->args; coro->args = 0;
1112 GvSV (PL_errgv) = newSV (0); 1196 GvSV (PL_errgv) = newSV (0);
1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1197 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1114 GvHV (PL_hintgv) = 0; 1198 GvHV (PL_hintgv) = newHV ();
1199#if PERL_VERSION_ATLEAST (5,10,0)
1200 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1201#endif
1115 PL_rs = newSVsv (GvSV (irsgv)); 1202 PL_rs = newSVsv (GvSV (irsgv));
1116 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1203 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1117 1204
1118 { 1205 {
1119 dSP; 1206 dSP;
1147 PL_op = (OP *)&init_perl_op; 1234 PL_op = (OP *)&init_perl_op;
1148 1235
1149 /* copy throw, in case it was set before init_perl */ 1236 /* copy throw, in case it was set before init_perl */
1150 CORO_THROW = coro->except; 1237 CORO_THROW = coro->except;
1151 1238
1152 SWAP_SVS (coro); 1239 SWAP_SVS_ENTER (coro);
1153 1240
1154 if (ecb_expect_false (enable_times)) 1241 if (ecb_expect_false (enable_times))
1155 { 1242 {
1156 coro_times_update (); 1243 coro_times_update ();
1157 coro_times_sub (coro); 1244 coro_times_sub (coro);
1195 /* this will cause transfer_check to croak on block*/ 1282 /* this will cause transfer_check to croak on block*/
1196 SvRV_set (coro_current, (SV *)coro->hv); 1283 SvRV_set (coro_current, (SV *)coro->hv);
1197 1284
1198 load_perl (aTHX_ coro); 1285 load_perl (aTHX_ coro);
1199 1286
1287 /* restore swapped sv's */
1288 SWAP_SVS_LEAVE (coro);
1289
1200 coro_unwind_stacks (aTHX); 1290 coro_unwind_stacks (aTHX);
1201
1202 /* restore swapped sv's */
1203 SWAP_SVS (coro);
1204 1291
1205 coro_destruct_stacks (aTHX); 1292 coro_destruct_stacks (aTHX);
1206 1293
1207 /* now save some sv's to be free'd later */ 1294 /* now save some sv's to be free'd later */
1208 svf [0] = GvSV (PL_defgv); 1295 svf [0] = GvSV (PL_defgv);
1229 1316
1230 SvREFCNT_dec (coro->saved_deffh); 1317 SvREFCNT_dec (coro->saved_deffh);
1231 SvREFCNT_dec (coro->rouse_cb); 1318 SvREFCNT_dec (coro->rouse_cb);
1232 SvREFCNT_dec (coro->invoke_cb); 1319 SvREFCNT_dec (coro->invoke_cb);
1233 SvREFCNT_dec (coro->invoke_av); 1320 SvREFCNT_dec (coro->invoke_av);
1321 SvREFCNT_dec (coro->on_enter_xs);
1322 SvREFCNT_dec (coro->on_leave_xs);
1234 } 1323 }
1235} 1324}
1236 1325
1237ecb_inline void 1326ecb_inline void
1238free_coro_mortal (pTHX) 1327free_coro_mortal (pTHX)
1301 1390
1302 if (PL_curcop != &PL_compiling) 1391 if (PL_curcop != &PL_compiling)
1303 { 1392 {
1304 SV **cb; 1393 SV **cb;
1305 1394
1306 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1395 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1307 { 1396 {
1308 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1397 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1309 1398
1310 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1399 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1311 { 1400 {
1453 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1542 * 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. 1543 * runtime errors here, as this is just a random interpreter, not a thread.
1455 */ 1544 */
1456 1545
1457 /* 1546 /*
1547 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1548 * requires PL_scopestack_ix, so do it here if required.
1549 */
1550 if (!PL_scopestack_ix)
1551 ENTER;
1552
1553 /*
1458 * If perl-run returns we assume exit() was being called or the coro 1554 * 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) 1555 * 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 1556 * reason for perl_run to return. We try to mimic whatever perl is normally
1461 * doing in that case. YMMV. 1557 * doing in that case. YMMV.
1462 */ 1558 */
1888 /* nothing to schedule: call the idle handler */ 1984 /* nothing to schedule: call the idle handler */
1889 if (SvROK (sv_idle) 1985 if (SvROK (sv_idle)
1890 && SvOBJECT (SvRV (sv_idle))) 1986 && SvOBJECT (SvRV (sv_idle)))
1891 { 1987 {
1892 if (SvRV (sv_idle) == SvRV (coro_current)) 1988 if (SvRV (sv_idle) == SvRV (coro_current))
1989 {
1990 require_pv ("Carp");
1991
1992 {
1993 dSP;
1994
1995 ENTER;
1996 SAVETMPS;
1997
1998 PUSHMARK (SP);
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1999 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2000 PUTBACK;
2001 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2002
2003 FREETMPS;
2004 LEAVE;
2005 }
2006 }
1894 2007
1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2008 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1896 api_ready (aTHX_ SvRV (sv_idle)); 2009 api_ready (aTHX_ SvRV (sv_idle));
1897 --coro_nready; 2010 --coro_nready;
1898 } 2011 }
2202 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2315 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2203 } 2316 }
2204 else 2317 else
2205 { 2318 {
2206 struct coro *self = SvSTATE_current; 2319 struct coro *self = SvSTATE_current;
2320
2321 if (!self)
2322 croak ("Coro::cancel called outside of thread content,");
2207 2323
2208 /* otherwise we cancel directly, purely for speed reasons 2324 /* otherwise we cancel directly, purely for speed reasons
2209 * unfortunately, this requires some magic trickery, as 2325 * unfortunately, this requires some magic trickery, as
2210 * somebody else could cancel us, so we have to fight the cancellation. 2326 * somebody else could cancel us, so we have to fight the cancellation.
2211 * this is ugly, and hopefully fully worth the extra speed. 2327 * this is ugly, and hopefully fully worth the extra speed.
2321 else 2437 else
2322 { 2438 {
2323 av_clear (GvAV (PL_defgv)); 2439 av_clear (GvAV (PL_defgv));
2324 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2440 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2325 2441
2442 if (ecb_expect_false (coro->swap_sv))
2443 {
2444 SWAP_SVS_LEAVE (coro);
2445 SvREFCNT_dec_NN (coro->swap_sv);
2446 coro->swap_sv = 0;
2447 }
2448
2326 coro->prio = 0; 2449 coro->prio = 0;
2327 2450
2328 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2451 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2329 api_trace (aTHX_ coro_current, 0); 2452 api_trace (aTHX_ coro_current, 0);
2330 2453
2331 frame->prepare = prepare_schedule; 2454 frame->prepare = prepare_schedule;
2332 av_push (av_async_pool, SvREFCNT_inc (hv)); 2455 av_push (av_async_pool, SvREFCNT_inc (hv));
2333 } 2456 }
2553 2676
2554/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2677/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2555static void 2678static void
2556slf_destroy (pTHX_ struct coro *coro) 2679slf_destroy (pTHX_ struct coro *coro)
2557{ 2680{
2558 /* this callback is reserved for slf functions needing to do cleanup */ 2681 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 2682
2562 /* 2683 /*
2563 * The on_destroy above most likely is from an SLF call. 2684 * The on_destroy below most likely is from an SLF call.
2564 * Since by definition the SLF call will not finish when we destroy 2685 * Since by definition the SLF call will not finish when we destroy
2565 * the coro, we will have to force-finish it here, otherwise 2686 * the coro, we will have to force-finish it here, otherwise
2566 * cleanup functions cannot call SLF functions. 2687 * cleanup functions cannot call SLF functions.
2567 */ 2688 */
2568 coro->slf_frame.prepare = 0; 2689 coro->slf_frame.prepare = 0;
2690
2691 /* this callback is reserved for slf functions needing to do cleanup */
2692 if (frame.destroy && frame.prepare && !PL_dirty)
2693 frame.destroy (aTHX_ &frame);
2569} 2694}
2570 2695
2571/* 2696/*
2572 * these not obviously related functions are all rolled into one 2697 * these not obviously related functions are all rolled into one
2573 * function to increase chances that they all will call transfer with the same 2698 * function to increase chances that they all will call transfer with the same
2756static void 2881static void
2757coro_pop_on_leave (pTHX_ void *coro) 2882coro_pop_on_leave (pTHX_ void *coro)
2758{ 2883{
2759 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2884 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2760 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2885 on_enterleave_call (aTHX_ sv_2mortal (cb));
2886}
2887
2888static void
2889enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2890{
2891 if (!hook)
2892 return;
2893
2894 if (!*avp)
2895 {
2896 *avp = newAV ();
2897 AvREAL_off (*avp);
2898 }
2899
2900 av_push (*avp, (SV *)hook);
2901 av_push (*avp, (SV *)arg);
2902}
2903
2904static void
2905enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2906{
2907 AV *av = *avp;
2908 int i;
2909
2910 if (!av)
2911 return;
2912
2913 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2914 if (AvARRAY (av)[i] == (SV *)hook)
2915 {
2916 if (execute)
2917 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2918
2919 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2920 av_pop (av);
2921 av_pop (av);
2922 break;
2923 }
2924
2925 if (AvFILLp (av) >= 0)
2926 {
2927 *avp = 0;
2928 SvREFCNT_dec_NN (av);
2929 }
2930}
2931
2932static void
2933api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2934{
2935 struct coro *coro = SvSTATE (coro_sv);
2936
2937 if (SvSTATE_current == coro)
2938 if (enter)
2939 enter (aTHX_ enter_arg);
2940
2941 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2943}
2944
2945static void
2946api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2947{
2948 struct coro *coro = SvSTATE (coro_sv);
2949
2950 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2952}
2953
2954static void
2955savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2956{
2957 struct coro *coro = SvSTATE_current;
2958
2959 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2960}
2961
2962static void
2963savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2964{
2965 struct coro *coro = SvSTATE_current;
2966
2967 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2968}
2969
2970static void
2971api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2972{
2973 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2974
2975 /* this ought to be much cheaper than malloc + a single destructor call */
2976 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2977 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2761} 2978}
2762 2979
2763/*****************************************************************************/ 2980/*****************************************************************************/
2764/* PerlIO::cede */ 2981/* PerlIO::cede */
2765 2982
2895 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3112 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2896 PUTBACK; 3113 PUTBACK;
2897 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3114 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2898 } 3115 }
2899 3116
2900 SvREFCNT_dec (cb); 3117 SvREFCNT_dec_NN (cb);
2901 } 3118 }
2902} 3119}
2903 3120
2904static void 3121static void
2905coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3122coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2913{ 3130{
2914 AV *av = (AV *)frame->data; 3131 AV *av = (AV *)frame->data;
2915 SV *count_sv = AvARRAY (av)[0]; 3132 SV *count_sv = AvARRAY (av)[0];
2916 SV *coro_hv = SvRV (coro_current); 3133 SV *coro_hv = SvRV (coro_current);
2917 3134
3135 frame->destroy = 0;
3136
2918 /* if we are about to throw, don't actually acquire the lock, just throw */ 3137 /* if we are about to throw, don't actually acquire the lock, just throw */
2919 if (CORO_THROW) 3138 if (ecb_expect_false (CORO_THROW))
3139 {
3140 /* we still might be responsible for the semaphore, so wake up others */
3141 coro_semaphore_adjust (aTHX_ av, 0);
3142
2920 return 0; 3143 return 0;
3144 }
2921 else if (SvIVX (count_sv) > 0) 3145 else if (SvIVX (count_sv) > 0)
2922 { 3146 {
2923 frame->destroy = 0;
2924
2925 if (acquire) 3147 if (acquire)
2926 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3148 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2927 else 3149 else
2928 coro_semaphore_adjust (aTHX_ av, 0); 3150 coro_semaphore_adjust (aTHX_ av, 0);
2929 3151
3040 { 3262 {
3041 api_ready (aTHX_ cb); 3263 api_ready (aTHX_ cb);
3042 sv_setiv (cb, 0); /* signal waiter */ 3264 sv_setiv (cb, 0); /* signal waiter */
3043 } 3265 }
3044 3266
3045 SvREFCNT_dec (cb); 3267 SvREFCNT_dec_NN (cb);
3046 3268
3047 --count; 3269 --count;
3048 } 3270 }
3049} 3271}
3050 3272
3135 } 3357 }
3136 3358
3137 av_push (state, data_sv); 3359 av_push (state, data_sv);
3138 3360
3139 api_ready (aTHX_ coro); 3361 api_ready (aTHX_ coro);
3140 SvREFCNT_dec (coro); 3362 SvREFCNT_dec_NN (coro);
3141 SvREFCNT_dec ((AV *)state); 3363 SvREFCNT_dec_NN ((AV *)state);
3142} 3364}
3143 3365
3144static int 3366static int
3145slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3367slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3146{ 3368{
3151 /* it quickly returns */ 3373 /* it quickly returns */
3152 if (CORO_THROW) 3374 if (CORO_THROW)
3153 return 0; 3375 return 0;
3154 3376
3155 /* one element that is an RV? repeat! */ 3377 /* one element that is an RV? repeat! */
3156 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3378 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3157 return 1; 3379 return 1;
3158 3380
3159 /* restore status */ 3381 /* restore status */
3160 { 3382 {
3161 SV *data_sv = av_pop (state); 3383 SV *data_sv = av_pop (state);
3164 errno = data->errorno; 3386 errno = data->errorno;
3165 PL_laststype = data->laststype; 3387 PL_laststype = data->laststype;
3166 PL_laststatval = data->laststatval; 3388 PL_laststatval = data->laststatval;
3167 PL_statcache = data->statcache; 3389 PL_statcache = data->statcache;
3168 3390
3169 SvREFCNT_dec (data_sv); 3391 SvREFCNT_dec_NN (data_sv);
3170 } 3392 }
3171 3393
3172 /* push result values */ 3394 /* push result values */
3173 { 3395 {
3174 dSP; 3396 dSP;
3389 3611
3390PROTOTYPES: DISABLE 3612PROTOTYPES: DISABLE
3391 3613
3392BOOT: 3614BOOT:
3393{ 3615{
3616#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3617#include "state.h"
3394#ifdef USE_ITHREADS 3618#ifdef USE_ITHREADS
3395# if CORO_PTHREAD 3619# if CORO_PTHREAD
3396 coro_thx = PERL_GET_CONTEXT; 3620 coro_thx = PERL_GET_CONTEXT;
3397# endif 3621# endif
3398#endif 3622#endif
3406 cctx_current = cctx_new_empty (); 3630 cctx_current = cctx_new_empty ();
3407 3631
3408 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3632 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3409 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3633 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3410 3634
3411 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3635 {
3412 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3636 /*
3413 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3637 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3638 * by coro_sig_vtbl in hash values.
3639 */
3640 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3641
3642 /* this only works if perl doesn't have a vtbl for %SIG */
3643 assert (!mg->mg_virtual);
3644
3645 /*
3646 * The irony is that the perl API itself asserts that mg_virtual
3647 * must be non-const, yet perl5porters insisted on marking their
3648 * vtbls as read-only, just to thwart perl modules from patching
3649 * them.
3650 */
3651 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3652 mg->mg_flags |= MGf_COPY;
3653
3654 coro_sigelem_vtbl = PL_vtbl_sigelem;
3655 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3656 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3657 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3658 }
3414 3659
3415 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3416 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3660 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)); 3661 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3418 3662
3419 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3663 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3420 3664
3726 if (ecb_expect_false (current == self)) 3970 if (ecb_expect_false (current == self))
3727 coro_times_sub (SvSTATE (coro_current)); 3971 coro_times_sub (SvSTATE (coro_current));
3728} 3972}
3729 3973
3730void 3974void
3731swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3975swap_sv (Coro::State coro, SV *sva, SV *svb)
3732 CODE: 3976 CODE:
3733{ 3977{
3734 struct coro *current = SvSTATE_current; 3978 struct coro *current = SvSTATE_current;
3979 AV *swap_sv;
3980 int i;
3981
3982 sva = SvRV (sva);
3983 svb = SvRV (svb);
3735 3984
3736 if (current == coro) 3985 if (current == coro)
3737 SWAP_SVS (current); 3986 SWAP_SVS_LEAVE (current);
3738 3987
3739 if (!coro->swap_sv) 3988 if (!coro->swap_sv)
3740 coro->swap_sv = newAV (); 3989 coro->swap_sv = newAV ();
3741 3990
3991 swap_sv = coro->swap_sv;
3992
3993 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3994 {
3995 SV *a = AvARRAY (swap_sv)[i ];
3996 SV *b = AvARRAY (swap_sv)[i + 1];
3997
3998 if (a == sva && b == svb)
3999 {
4000 SvREFCNT_dec_NN (a);
4001 SvREFCNT_dec_NN (b);
4002
4003 for (; i <= AvFILLp (swap_sv) - 2; i++)
4004 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4005
4006 AvFILLp (swap_sv) -= 2;
4007
4008 goto removed;
4009 }
4010 }
4011
3742 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4012 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3743 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4013 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4014
4015 removed:
3744 4016
3745 if (current == coro) 4017 if (current == coro)
3746 SWAP_SVS (current); 4018 SWAP_SVS_ENTER (current);
3747} 4019}
3748 4020
3749 4021
3750MODULE = Coro::State PACKAGE = Coro 4022MODULE = Coro::State PACKAGE = Coro
3751 4023
3752BOOT: 4024BOOT:
3753{ 4025{
4026 if (SVt_LAST > 32)
4027 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4028
3754 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4029 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3755 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4030 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3756 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4031 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3757 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4032 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); 4033 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3784 coroapi.ready = api_ready; 4059 coroapi.ready = api_ready;
3785 coroapi.is_ready = api_is_ready; 4060 coroapi.is_ready = api_is_ready;
3786 coroapi.nready = coro_nready; 4061 coroapi.nready = coro_nready;
3787 coroapi.current = coro_current; 4062 coroapi.current = coro_current;
3788 4063
4064 coroapi.enterleave_hook = api_enterleave_hook;
4065 coroapi.enterleave_unhook = api_enterleave_unhook;
4066 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4067
3789 /*GCoroAPI = &coroapi;*/ 4068 /*GCoroAPI = &coroapi;*/
3790 sv_setiv (sv, (IV)&coroapi); 4069 sv_setiv (sv, (IV)&coroapi);
3791 SvREADONLY_on (sv); 4070 SvREADONLY_on (sv);
3792 } 4071 }
3793} 4072}
3858 4137
3859void 4138void
3860_set_current (SV *current) 4139_set_current (SV *current)
3861 PROTOTYPE: $ 4140 PROTOTYPE: $
3862 CODE: 4141 CODE:
3863 SvREFCNT_dec (SvRV (coro_current)); 4142 SvREFCNT_dec_NN (SvRV (coro_current));
3864 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4143 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3865 4144
3866void 4145void
3867_set_readyhook (SV *hook) 4146_set_readyhook (SV *hook)
3868 PROTOTYPE: $ 4147 PROTOTYPE: $
3952 4231
3953 if ((SV *)hv == &PL_sv_undef) 4232 if ((SV *)hv == &PL_sv_undef)
3954 { 4233 {
3955 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4234 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3956 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4235 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3957 SvREFCNT_dec (sv); 4236 SvREFCNT_dec_NN (sv);
3958 } 4237 }
3959 4238
3960 { 4239 {
3961 struct coro *coro = SvSTATE_hv (hv); 4240 struct coro *coro = SvSTATE_hv (hv);
3962 4241
3969 api_ready (aTHX_ (SV *)hv); 4248 api_ready (aTHX_ (SV *)hv);
3970 4249
3971 if (GIMME_V != G_VOID) 4250 if (GIMME_V != G_VOID)
3972 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4251 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3973 else 4252 else
3974 SvREFCNT_dec (hv); 4253 SvREFCNT_dec_NN (hv);
3975} 4254}
3976 4255
3977SV * 4256SV *
3978rouse_cb () 4257rouse_cb ()
3979 PROTOTYPE: 4258 PROTOTYPE:
4058 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4337 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4059 OUTPUT: 4338 OUTPUT:
4060 RETVAL 4339 RETVAL
4061 4340
4062void 4341void
4063up (SV *self, int adjust = 1) 4342up (SV *self)
4064 ALIAS:
4065 adjust = 1
4066 CODE: 4343 CODE:
4344 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4345
4346void
4347adjust (SV *self, int adjust)
4348 CODE:
4067 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4349 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4068 4350
4069void 4351void
4070down (...) 4352down (...)
4071 CODE: 4353 CODE:
4072 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4354 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines