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.426 by root, Wed Dec 5 00:19:57 2012 UTC vs.
Revision 1.465 by root, Sat Jun 25 19:04:04 2016 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
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
52# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
53#else 74#else
54# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
55#endif 76#endif
56 77
57#if HAVE_MMAP
58# include <unistd.h>
59# include <sys/mman.h>
60# ifndef MAP_ANONYMOUS
61# ifdef MAP_ANON
62# define MAP_ANONYMOUS MAP_ANON
63# else
64# undef HAVE_MMAP
65# endif
66# endif
67# include <limits.h>
68# ifndef PAGESIZE
69# define PAGESIZE pagesize
70# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
71static long pagesize;
72# else
73# define BOOT_PAGESIZE (void)0
74# endif
75#else
76# define PAGESIZE 0
77# define BOOT_PAGESIZE (void)0
78#endif
79
80#if CORO_USE_VALGRIND
81# include <valgrind/valgrind.h>
82#endif
83
84/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
85static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
86 80
87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
88# define HAS_SCOPESTACK_NAME 1 82# define HAS_SCOPESTACK_NAME 1
89#endif
90
91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
92# undef CORO_STACKGUARD
93#endif
94
95#ifndef CORO_STACKGUARD
96# define CORO_STACKGUARD 0
97#endif 83#endif
98 84
99/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
100#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
101# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
130# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
131# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
132# endif 118# endif
133#endif 119#endif
134 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
135static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
136static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
137 129
138/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
139#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
154 146
155static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
156static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
157static SV *rv_diehook; 149static SV *rv_diehook;
158static SV *rv_warnhook; 150static SV *rv_warnhook;
159static HV *hv_sig; /* %SIG */
160 151
161/* async_pool helper stuff */ 152/* async_pool helper stuff */
162static SV *sv_pool_rss; 153static SV *sv_pool_rss;
163static SV *sv_pool_size; 154static SV *sv_pool_size;
164static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
192typedef struct coro_cctx 183typedef struct coro_cctx
193{ 184{
194 struct coro_cctx *next; 185 struct coro_cctx *next;
195 186
196 /* the stack */ 187 /* the stack */
197 void *sptr; 188 struct coro_stack stack;
198 size_t ssize;
199 189
200 /* cpu state */ 190 /* cpu state */
201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 191 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG 192#ifndef NDEBUG
203 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 193 JMPENV *idle_te; /* same as idle_sp, but for top_env */
271 SV *saved_deffh; 261 SV *saved_deffh;
272 SV *invoke_cb; 262 SV *invoke_cb;
273 AV *invoke_av; 263 AV *invoke_av;
274 264
275 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
276 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
277 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
278 268
279 /* swap_sv */ 269 /* swap_sv */
280 AV *swap_sv; 270 AV *swap_sv;
281 271
282 /* times */ 272 /* times */
312#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
313 303
314/** JIT *********************************************************************/ 304/** JIT *********************************************************************/
315 305
316#if CORO_JIT 306#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */ 307 /* APPLE doesn't have mmap though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 308 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE 309 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY 310 #if ECB_AMD64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix" 311 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY 312 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix" 313 #define CORO_JIT_TYPE "x86-unix"
324 #endif 314 #endif
325 #endif 315 #endif
326#endif 316#endif
327 317
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 318#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
329 #undef CORO_JIT 319 #undef CORO_JIT
330#endif 320#endif
331 321
332#if CORO_JIT 322#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *); 323 typedef void (*load_save_perl_slots_type)(perl_slots *);
518 508
519 return 0; 509 return 0;
520} 510}
521 511
522ecb_inline struct coro * 512ecb_inline struct coro *
523SvSTATE_ (pTHX_ SV *coro) 513SvSTATE_ (pTHX_ SV *coro_sv)
524{ 514{
525 MAGIC *mg; 515 MAGIC *mg;
526 516
527 if (SvROK (coro)) 517 if (SvROK (coro_sv))
528 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
529 519
530 mg = SvSTATEhv_p (aTHX_ coro); 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
531 if (!mg) 521 if (!mg)
532 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
533 523
534 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
535} 525}
546ecb_inline PADLIST * 536ecb_inline PADLIST *
547coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
548{ 538{
549 PADLIST *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
550 PADLIST *newpadlist; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
551 PAD *newpad; 542 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1; 543 PADOFFSET off = PadlistMAX (padlist) + 1;
553 544
554 newPADLIST(newpadlist); 545#if NEWPADAPI
555#if !PERL_VERSION_ATLEAST(5,15,3) 546
556 /* 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 */
557 AvREAL_off (newpadlist); 548 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
558#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
559#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off); 560 Perl_pad_push (aTHX_ padlist, off);
561#else 561#else
562 Perl_pad_push (aTHX_ padlist, off, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif 563#endif
564
564 newpad = PadlistARRAY (padlist)[off]; 565 newpad = PadlistARRAY (padlist)[off];
565 PadlistMAX (padlist) = off - 1; 566 PadlistMAX (padlist) = off - 1;
566 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
567 /* Already extended to 2 elements by newPADLIST. */ 576 /* Already extended to 2 elements by newPADLIST. */
568 PadlistMAX (newpadlist) = 1; 577 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
570 PadlistARRAY (newpadlist)[1] = newpad; 583 PadlistARRAY (newpadlist)[1] = newpad;
571 584
572 return newpadlist; 585 return newpadlist;
573} 586}
574 587
582 595
583 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
584 { 597 {
585 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
586 PAD *pad = PadlistARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
600
601 if (pad)
602 {
587 I32 j = PadMAX (pad); 603 I32 j = PadMAX (pad);
588 604
589 while (j >= 0) 605 while (j >= 0)
590 SvREFCNT_dec (PadARRAY (pad)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
591 607
592 PadMAX (pad) = -1; 608 PadMAX (pad) = -1;
593 SvREFCNT_dec (pad); 609 SvREFCNT_dec (pad);
610 }
594 } 611 }
595 612
596 SvREFCNT_dec (PadlistNAMES (padlist)); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
597 614
598#ifdef NEWPADAPI 615#if NEWPADAPI
599 Safefree (PadlistARRAY (padlist)); 616 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist); 617 Safefree (padlist);
601#else 618#else
602 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist); 620 AvREAL_off (padlist);
697 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;
698 715
699 /* 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,
700 * 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.
701 */ 718 */
702 #define svany_in_head(type) \ 719 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
703 (((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)))
704 725
705 if (svany_in_head (SvTYPE (a))) 726 if (svany_in_head (SvTYPE (a)))
706 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
707 728
708 if (svany_in_head (SvTYPE (b))) 729 if (svany_in_head (SvTYPE (b)))
711#endif 732#endif
712} 733}
713 734
714/* swap sv heads, at least logically */ 735/* swap sv heads, at least logically */
715static void 736static void
716swap_svs (pTHX_ Coro__State c) 737swap_svs_enter (pTHX_ Coro__State c)
717{ 738{
718 int i; 739 int i;
719 740
720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
721 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]);
722} 743}
723 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
724#define SWAP_SVS(coro) \ 754#define SWAP_SVS_ENTER(coro) \
725 if (ecb_expect_false ((coro)->swap_sv)) \ 755 if (ecb_expect_false ((coro)->swap_sv)) \
726 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))
727 761
728static void 762static void
729on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
730 764
731static void 765static void
776 810
777 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
779 } 813 }
780 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
781 SWAP_SVS (c); 823 SWAP_SVS_ENTER (c);
782} 824}
783 825
784static void 826static void
785save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
786{ 828{
787 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 }
788 838
789 if (ecb_expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
790 { 840 {
791 int i; 841 int i;
792 842
919#endif 969#endif
920 970
921 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
922 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
923 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
924 979
925#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
926 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
927 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
928 PL_retstack_max = 4; 983 PL_retstack_max = 4;
994 } 1049 }
995 1050
996 return rss; 1051 return rss;
997} 1052}
998 1053
999/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
1000
1001static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
1002static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
1003static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
1004 1055
1005/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
1006#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
1007#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1008 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1009 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
1010#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 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1070 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1071 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1072 return 1;
1073}
1074
1075/* perl does not have a %SIG vtbl, we provide one so we can override */
1076/* the cwvtblagic for %SIG members */
1077static const MGVTBL coro_sig_vtbl = {
1078 0, 0, 0, 0, 0,
1079 coro_sig_copy
1080};
1011 1081
1012/* 1082/*
1013 * This overrides the default magic get method of %SIG elements. 1083 * This overrides the default magic get method of %SIG elements.
1014 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1084 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
1015 * and instead of trying to save and restore the hash elements (extremely slow), 1085 * and instead of trying to save and restore the hash elements (extremely slow),
1041 sv_setsv (sv, ssv); 1111 sv_setsv (sv, ssv);
1042 return 0; 1112 return 0;
1043 } 1113 }
1044 } 1114 }
1045 1115
1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1116 return PL_vtbl_sigelem.svt_get ? PL_vtbl_sigelem.svt_get (aTHX_ sv, mg) : 0;
1047} 1117}
1048 1118
1049static int ecb_cold 1119static int ecb_cold
1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1120coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1051{ 1121{
1065 SvREFCNT_dec (old); 1135 SvREFCNT_dec (old);
1066 return 0; 1136 return 0;
1067 } 1137 }
1068 } 1138 }
1069 1139
1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1140 return PL_vtbl_sigelem.svt_clear ? PL_vtbl_sigelem.svt_clear (aTHX_ sv, mg) : 0;
1071} 1141}
1072 1142
1073static int ecb_cold 1143static int ecb_cold
1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1144coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1075{ 1145{
1089 SvREFCNT_dec (old); 1159 SvREFCNT_dec (old);
1090 return 0; 1160 return 0;
1091 } 1161 }
1092 } 1162 }
1093 1163
1094 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 1164 return PL_vtbl_sigelem.svt_set ? PL_vtbl_sigelem.svt_set (aTHX_ sv, mg) : 0;
1095} 1165}
1096 1166
1097static void 1167static void
1098prepare_nop (pTHX_ struct coro_transfer_args *ta) 1168prepare_nop (pTHX_ struct coro_transfer_args *ta)
1099{ 1169{
1110static int 1180static int
1111slf_check_repeat (pTHX_ struct CoroSLF *frame) 1181slf_check_repeat (pTHX_ struct CoroSLF *frame)
1112{ 1182{
1113 return 1; 1183 return 1;
1114} 1184}
1185
1186/** coroutine stack handling ************************************************/
1115 1187
1116static UNOP init_perl_op; 1188static UNOP init_perl_op;
1117 1189
1118ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1190ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1119init_perl (pTHX_ struct coro *coro) 1191init_perl (pTHX_ struct coro *coro)
1145 1217
1146 GvSV (PL_defgv) = newSV (0); 1218 GvSV (PL_defgv) = newSV (0);
1147 GvAV (PL_defgv) = coro->args; coro->args = 0; 1219 GvAV (PL_defgv) = coro->args; coro->args = 0;
1148 GvSV (PL_errgv) = newSV (0); 1220 GvSV (PL_errgv) = newSV (0);
1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1221 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1150 GvHV (PL_hintgv) = 0; 1222 GvHV (PL_hintgv) = newHV ();
1223#if PERL_VERSION_ATLEAST (5,10,0)
1224 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1225#endif
1151 PL_rs = newSVsv (GvSV (irsgv)); 1226 PL_rs = newSVsv (GvSV (irsgv));
1152 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1227 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1153 1228
1154 { 1229 {
1155 dSP; 1230 dSP;
1183 PL_op = (OP *)&init_perl_op; 1258 PL_op = (OP *)&init_perl_op;
1184 1259
1185 /* copy throw, in case it was set before init_perl */ 1260 /* copy throw, in case it was set before init_perl */
1186 CORO_THROW = coro->except; 1261 CORO_THROW = coro->except;
1187 1262
1188 SWAP_SVS (coro); 1263 SWAP_SVS_ENTER (coro);
1189 1264
1190 if (ecb_expect_false (enable_times)) 1265 if (ecb_expect_false (enable_times))
1191 { 1266 {
1192 coro_times_update (); 1267 coro_times_update ();
1193 coro_times_sub (coro); 1268 coro_times_sub (coro);
1231 /* this will cause transfer_check to croak on block*/ 1306 /* this will cause transfer_check to croak on block*/
1232 SvRV_set (coro_current, (SV *)coro->hv); 1307 SvRV_set (coro_current, (SV *)coro->hv);
1233 1308
1234 load_perl (aTHX_ coro); 1309 load_perl (aTHX_ coro);
1235 1310
1311 /* restore swapped sv's */
1312 SWAP_SVS_LEAVE (coro);
1313
1236 coro_unwind_stacks (aTHX); 1314 coro_unwind_stacks (aTHX);
1237
1238 /* restore swapped sv's */
1239 SWAP_SVS (coro);
1240 1315
1241 coro_destruct_stacks (aTHX); 1316 coro_destruct_stacks (aTHX);
1242 1317
1243 /* now save some sv's to be free'd later */ 1318 /* now save some sv's to be free'd later */
1244 svf [0] = GvSV (PL_defgv); 1319 svf [0] = GvSV (PL_defgv);
1265 1340
1266 SvREFCNT_dec (coro->saved_deffh); 1341 SvREFCNT_dec (coro->saved_deffh);
1267 SvREFCNT_dec (coro->rouse_cb); 1342 SvREFCNT_dec (coro->rouse_cb);
1268 SvREFCNT_dec (coro->invoke_cb); 1343 SvREFCNT_dec (coro->invoke_cb);
1269 SvREFCNT_dec (coro->invoke_av); 1344 SvREFCNT_dec (coro->invoke_av);
1345 SvREFCNT_dec (coro->on_enter_xs);
1346 SvREFCNT_dec (coro->on_leave_xs);
1270 } 1347 }
1271} 1348}
1272 1349
1273ecb_inline void 1350ecb_inline void
1274free_coro_mortal (pTHX) 1351free_coro_mortal (pTHX)
1337 1414
1338 if (PL_curcop != &PL_compiling) 1415 if (PL_curcop != &PL_compiling)
1339 { 1416 {
1340 SV **cb; 1417 SV **cb;
1341 1418
1342 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1419 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1343 { 1420 {
1344 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1421 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1345 1422
1346 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1423 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1347 { 1424 {
1489 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1566 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1490 * runtime errors here, as this is just a random interpreter, not a thread. 1567 * runtime errors here, as this is just a random interpreter, not a thread.
1491 */ 1568 */
1492 1569
1493 /* 1570 /*
1571 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1572 * requires PL_scopestack_ix, so do it here if required.
1573 */
1574 if (!PL_scopestack_ix)
1575 ENTER;
1576
1577 /*
1494 * If perl-run returns we assume exit() was being called or the coro 1578 * If perl-run returns we assume exit() was being called or the coro
1495 * fell off the end, which seems to be the only valid (non-bug) 1579 * fell off the end, which seems to be the only valid (non-bug)
1496 * reason for perl_run to return. We try to mimic whatever perl is normally 1580 * reason for perl_run to return. We try to mimic whatever perl is normally
1497 * doing in that case. YMMV. 1581 * doing in that case. YMMV.
1498 */ 1582 */
1519static coro_cctx * 1603static coro_cctx *
1520cctx_new_empty (void) 1604cctx_new_empty (void)
1521{ 1605{
1522 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1523 1607
1524 cctx->sptr = 0; 1608 cctx->stack.sptr = 0;
1525 coro_create (&cctx->cctx, 0, 0, 0, 0); 1609 coro_create (&cctx->cctx, 0, 0, 0, 0);
1526 1610
1527 return cctx; 1611 return cctx;
1528} 1612}
1529 1613
1530/* create a new cctx suitable as destination/running a perl interpreter */ 1614/* create a new cctx suitable as destination/running a perl interpreter */
1531static coro_cctx * 1615static coro_cctx *
1532cctx_new_run (void) 1616cctx_new_run (void)
1533{ 1617{
1534 coro_cctx *cctx = cctx_new (); 1618 coro_cctx *cctx = cctx_new ();
1535 void *stack_start;
1536 size_t stack_size;
1537 1619
1538#if HAVE_MMAP 1620 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1539 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1540 /* mmap supposedly does allocate-on-write for us */
1541 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1542
1543 if (cctx->sptr != (void *)-1)
1544 {
1545 #if CORO_STACKGUARD
1546 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1547 #endif
1548 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1549 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1550 cctx->flags |= CC_MAPPED;
1551 } 1621 {
1552 else
1553#endif
1554 {
1555 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1556 New (0, cctx->sptr, cctx_stacksize, long);
1557
1558 if (!cctx->sptr)
1559 {
1560 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1622 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1561 _exit (EXIT_FAILURE); 1623 _exit (EXIT_FAILURE);
1562 }
1563
1564 stack_start = cctx->sptr;
1565 stack_size = cctx->ssize;
1566 } 1624 }
1567 1625
1568 #if CORO_USE_VALGRIND
1569 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1570 #endif
1571
1572 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1626 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1573 1627
1574 return cctx; 1628 return cctx;
1575} 1629}
1576 1630
1577static void 1631static void
1583 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1637 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1584 1638
1585 --cctx_count; 1639 --cctx_count;
1586 coro_destroy (&cctx->cctx); 1640 coro_destroy (&cctx->cctx);
1587 1641
1588 /* coro_transfer creates new, empty cctx's */ 1642 coro_stack_free (&cctx->stack);
1589 if (cctx->sptr)
1590 {
1591 #if CORO_USE_VALGRIND
1592 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1593 #endif
1594
1595#if HAVE_MMAP
1596 if (cctx->flags & CC_MAPPED)
1597 munmap (cctx->sptr, cctx->ssize);
1598 else
1599#endif
1600 Safefree (cctx->sptr);
1601 }
1602 1643
1603 Safefree (cctx); 1644 Safefree (cctx);
1604} 1645}
1605 1646
1606/* wether this cctx should be destructed */ 1647/* wether this cctx should be destructed */
1625} 1666}
1626 1667
1627static void 1668static void
1628cctx_put (coro_cctx *cctx) 1669cctx_put (coro_cctx *cctx)
1629{ 1670{
1630 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1671 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1631 1672
1632 /* free another cctx if overlimit */ 1673 /* free another cctx if overlimit */
1633 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1674 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1634 { 1675 {
1635 coro_cctx *first = cctx_first; 1676 coro_cctx *first = cctx_first;
1967 /* nothing to schedule: call the idle handler */ 2008 /* nothing to schedule: call the idle handler */
1968 if (SvROK (sv_idle) 2009 if (SvROK (sv_idle)
1969 && SvOBJECT (SvRV (sv_idle))) 2010 && SvOBJECT (SvRV (sv_idle)))
1970 { 2011 {
1971 if (SvRV (sv_idle) == SvRV (coro_current)) 2012 if (SvRV (sv_idle) == SvRV (coro_current))
2013 {
2014 require_pv ("Carp");
2015
2016 {
2017 dSP;
2018
2019 ENTER;
2020 SAVETMPS;
2021
2022 PUSHMARK (SP);
1972 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2023 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2024 PUTBACK;
2025 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2026
2027 FREETMPS;
2028 LEAVE;
2029 }
2030 }
1973 2031
1974 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2032 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1975 api_ready (aTHX_ SvRV (sv_idle)); 2033 api_ready (aTHX_ SvRV (sv_idle));
1976 --coro_nready; 2034 --coro_nready;
1977 } 2035 }
2175 AV *od = coro->on_destroy; 2233 AV *od = coro->on_destroy;
2176 2234
2177 if (!od) 2235 if (!od)
2178 return; 2236 return;
2179 2237
2238 coro->on_destroy = 0;
2239 sv_2mortal ((SV *)od);
2240
2180 while (AvFILLp (od) >= 0) 2241 while (AvFILLp (od) >= 0)
2181 { 2242 {
2182 SV *cb = sv_2mortal (av_pop (od)); 2243 SV *cb = sv_2mortal (av_pop (od));
2183 2244
2184 /* coro hv's (and only hv's at the moment) are supported as well */ 2245 /* coro hv's (and only hv's at the moment) are supported as well */
2278 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2339 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2279 } 2340 }
2280 else 2341 else
2281 { 2342 {
2282 struct coro *self = SvSTATE_current; 2343 struct coro *self = SvSTATE_current;
2344
2345 if (!self)
2346 croak ("Coro::cancel called outside of thread content,");
2283 2347
2284 /* otherwise we cancel directly, purely for speed reasons 2348 /* otherwise we cancel directly, purely for speed reasons
2285 * unfortunately, this requires some magic trickery, as 2349 * unfortunately, this requires some magic trickery, as
2286 * somebody else could cancel us, so we have to fight the cancellation. 2350 * somebody else could cancel us, so we have to fight the cancellation.
2287 * this is ugly, and hopefully fully worth the extra speed. 2351 * this is ugly, and hopefully fully worth the extra speed.
2397 else 2461 else
2398 { 2462 {
2399 av_clear (GvAV (PL_defgv)); 2463 av_clear (GvAV (PL_defgv));
2400 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2464 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2401 2465
2466 if (ecb_expect_false (coro->swap_sv))
2467 {
2468 swap_svs_leave (coro);
2469 SvREFCNT_dec_NN (coro->swap_sv);
2470 coro->swap_sv = 0;
2471 }
2472
2402 coro->prio = 0; 2473 coro->prio = 0;
2403 2474
2404 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2475 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2405 api_trace (aTHX_ coro_current, 0); 2476 api_trace (aTHX_ coro_current, 0);
2406 2477
2407 frame->prepare = prepare_schedule; 2478 frame->prepare = prepare_schedule;
2408 av_push (av_async_pool, SvREFCNT_inc (hv)); 2479 av_push (av_async_pool, SvREFCNT_inc (hv));
2409 } 2480 }
2629 2700
2630/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2701/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2631static void 2702static void
2632slf_destroy (pTHX_ struct coro *coro) 2703slf_destroy (pTHX_ struct coro *coro)
2633{ 2704{
2634 /* this callback is reserved for slf functions needing to do cleanup */ 2705 struct CoroSLF frame = coro->slf_frame;
2635 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2636 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2637 2706
2638 /* 2707 /*
2639 * The on_destroy above most likely is from an SLF call. 2708 * The on_destroy below most likely is from an SLF call.
2640 * Since by definition the SLF call will not finish when we destroy 2709 * Since by definition the SLF call will not finish when we destroy
2641 * the coro, we will have to force-finish it here, otherwise 2710 * the coro, we will have to force-finish it here, otherwise
2642 * cleanup functions cannot call SLF functions. 2711 * cleanup functions cannot call SLF functions.
2643 */ 2712 */
2644 coro->slf_frame.prepare = 0; 2713 coro->slf_frame.prepare = 0;
2714
2715 /* this callback is reserved for slf functions needing to do cleanup */
2716 if (frame.destroy && frame.prepare && !PL_dirty)
2717 frame.destroy (aTHX_ &frame);
2645} 2718}
2646 2719
2647/* 2720/*
2648 * these not obviously related functions are all rolled into one 2721 * these not obviously related functions are all rolled into one
2649 * function to increase chances that they all will call transfer with the same 2722 * function to increase chances that they all will call transfer with the same
2832static void 2905static void
2833coro_pop_on_leave (pTHX_ void *coro) 2906coro_pop_on_leave (pTHX_ void *coro)
2834{ 2907{
2835 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2908 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2836 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2909 on_enterleave_call (aTHX_ sv_2mortal (cb));
2910}
2911
2912static void
2913enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2914{
2915 if (!hook)
2916 return;
2917
2918 if (!*avp)
2919 {
2920 *avp = newAV ();
2921 AvREAL_off (*avp);
2922 }
2923
2924 av_push (*avp, (SV *)hook);
2925 av_push (*avp, (SV *)arg);
2926}
2927
2928static void
2929enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2930{
2931 AV *av = *avp;
2932 int i;
2933
2934 if (!av)
2935 return;
2936
2937 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2938 if (AvARRAY (av)[i] == (SV *)hook)
2939 {
2940 if (execute)
2941 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2942
2943 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2944 av_pop (av);
2945 av_pop (av);
2946 break;
2947 }
2948
2949 if (AvFILLp (av) >= 0)
2950 {
2951 *avp = 0;
2952 SvREFCNT_dec_NN (av);
2953 }
2954}
2955
2956static void
2957api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 if (SvSTATE_current == coro)
2962 if (enter)
2963 enter (aTHX_ enter_arg);
2964
2965 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2966 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2967}
2968
2969static void
2970api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2971{
2972 struct coro *coro = SvSTATE (coro_sv);
2973
2974 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2975 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2976}
2977
2978static void
2979savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2980{
2981 struct coro *coro = SvSTATE_current;
2982
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2984}
2985
2986static void
2987savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2992}
2993
2994static void
2995api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2996{
2997 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2998
2999 /* this ought to be much cheaper than malloc + a single destructor call */
3000 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3001 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2837} 3002}
2838 3003
2839/*****************************************************************************/ 3004/*****************************************************************************/
2840/* PerlIO::cede */ 3005/* PerlIO::cede */
2841 3006
2971 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3136 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2972 PUTBACK; 3137 PUTBACK;
2973 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3138 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2974 } 3139 }
2975 3140
2976 SvREFCNT_dec (cb); 3141 SvREFCNT_dec_NN (cb);
2977 } 3142 }
2978} 3143}
2979 3144
2980static void 3145static void
2981coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3146coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2989{ 3154{
2990 AV *av = (AV *)frame->data; 3155 AV *av = (AV *)frame->data;
2991 SV *count_sv = AvARRAY (av)[0]; 3156 SV *count_sv = AvARRAY (av)[0];
2992 SV *coro_hv = SvRV (coro_current); 3157 SV *coro_hv = SvRV (coro_current);
2993 3158
3159 frame->destroy = 0;
3160
2994 /* if we are about to throw, don't actually acquire the lock, just throw */ 3161 /* if we are about to throw, don't actually acquire the lock, just throw */
2995 if (CORO_THROW) 3162 if (ecb_expect_false (CORO_THROW))
3163 {
3164 /* we still might be responsible for the semaphore, so wake up others */
3165 coro_semaphore_adjust (aTHX_ av, 0);
3166
2996 return 0; 3167 return 0;
3168 }
2997 else if (SvIVX (count_sv) > 0) 3169 else if (SvIVX (count_sv) > 0)
2998 { 3170 {
2999 frame->destroy = 0;
3000
3001 if (acquire) 3171 if (acquire)
3002 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3172 SvIVX (count_sv) = SvIVX (count_sv) - 1;
3003 else 3173 else
3004 coro_semaphore_adjust (aTHX_ av, 0); 3174 coro_semaphore_adjust (aTHX_ av, 0);
3005 3175
3116 { 3286 {
3117 api_ready (aTHX_ cb); 3287 api_ready (aTHX_ cb);
3118 sv_setiv (cb, 0); /* signal waiter */ 3288 sv_setiv (cb, 0); /* signal waiter */
3119 } 3289 }
3120 3290
3121 SvREFCNT_dec (cb); 3291 SvREFCNT_dec_NN (cb);
3122 3292
3123 --count; 3293 --count;
3124 } 3294 }
3125} 3295}
3126 3296
3211 } 3381 }
3212 3382
3213 av_push (state, data_sv); 3383 av_push (state, data_sv);
3214 3384
3215 api_ready (aTHX_ coro); 3385 api_ready (aTHX_ coro);
3216 SvREFCNT_dec (coro); 3386 SvREFCNT_dec_NN (coro);
3217 SvREFCNT_dec ((AV *)state); 3387 SvREFCNT_dec_NN ((AV *)state);
3218} 3388}
3219 3389
3220static int 3390static int
3221slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3391slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3222{ 3392{
3227 /* it quickly returns */ 3397 /* it quickly returns */
3228 if (CORO_THROW) 3398 if (CORO_THROW)
3229 return 0; 3399 return 0;
3230 3400
3231 /* one element that is an RV? repeat! */ 3401 /* one element that is an RV? repeat! */
3232 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3402 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3233 return 1; 3403 return 1;
3234 3404
3235 /* restore status */ 3405 /* restore status */
3236 { 3406 {
3237 SV *data_sv = av_pop (state); 3407 SV *data_sv = av_pop (state);
3240 errno = data->errorno; 3410 errno = data->errorno;
3241 PL_laststype = data->laststype; 3411 PL_laststype = data->laststype;
3242 PL_laststatval = data->laststatval; 3412 PL_laststatval = data->laststatval;
3243 PL_statcache = data->statcache; 3413 PL_statcache = data->statcache;
3244 3414
3245 SvREFCNT_dec (data_sv); 3415 SvREFCNT_dec_NN (data_sv);
3246 } 3416 }
3247 3417
3248 /* push result values */ 3418 /* push result values */
3249 { 3419 {
3250 dSP; 3420 dSP;
3465 3635
3466PROTOTYPES: DISABLE 3636PROTOTYPES: DISABLE
3467 3637
3468BOOT: 3638BOOT:
3469{ 3639{
3640#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3641#include "state.h"
3470#ifdef USE_ITHREADS 3642#ifdef USE_ITHREADS
3471# if CORO_PTHREAD 3643# if CORO_PTHREAD
3472 coro_thx = PERL_GET_CONTEXT; 3644 coro_thx = PERL_GET_CONTEXT;
3473# endif 3645# endif
3474#endif 3646#endif
3475 BOOT_PAGESIZE;
3476
3477 /* perl defines these to check for existance first, but why it doesn't */ 3647 /* perl defines these to check for existance first, but why it doesn't */
3478 /* just create them one at init time is not clear to me, except for */ 3648 /* just create them one at init time is not clear to me, except for */
3479 /* programs trying to delete them, but... */ 3649 /* programs trying to delete them, but... */
3480 /* anyway, we declare this as invalid and make sure they are initialised here */ 3650 /* anyway, we declare this as invalid and make sure they are initialised here */
3481 DEFSV; 3651 DEFSV;
3484 cctx_current = cctx_new_empty (); 3654 cctx_current = cctx_new_empty ();
3485 3655
3486 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3656 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3487 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3657 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3488 3658
3489 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3659 {
3490 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3660 /*
3491 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3661 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3662 * by coro_sig_vtbl in hash values.
3663 */
3664 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3665
3666 /* this only works if perl doesn't have a vtbl for %SIG */
3667 assert (!mg->mg_virtual);
3668
3669 /*
3670 * The irony is that the perl API itself asserts that mg_virtual
3671 * must be non-const, yet perl5porters insisted on marking their
3672 * vtbls as read-only, just to thwart perl modules from patching
3673 * them.
3674 */
3675 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3676 mg->mg_flags |= MGf_COPY;
3677
3678 coro_sigelem_vtbl = PL_vtbl_sigelem;
3679 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3680 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3681 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3682 }
3492 3683
3493 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3494 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3684 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3495 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3685 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3496 3686
3497 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3687 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3498 3688
3551void 3741void
3552transfer (...) 3742transfer (...)
3553 PROTOTYPE: $$ 3743 PROTOTYPE: $$
3554 CODE: 3744 CODE:
3555 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3745 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3556
3557void
3558_exit (int code)
3559 PROTOTYPE: $
3560 CODE:
3561 _exit (code);
3562 3746
3563SV * 3747SV *
3564clone (Coro::State coro) 3748clone (Coro::State coro)
3565 CODE: 3749 CODE:
3566{ 3750{
3810 if (ecb_expect_false (current == self)) 3994 if (ecb_expect_false (current == self))
3811 coro_times_sub (SvSTATE (coro_current)); 3995 coro_times_sub (SvSTATE (coro_current));
3812} 3996}
3813 3997
3814void 3998void
3815swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3999swap_sv (Coro::State coro, SV *sva, SV *svb)
3816 CODE: 4000 CODE:
3817{ 4001{
3818 struct coro *current = SvSTATE_current; 4002 struct coro *current = SvSTATE_current;
4003 AV *swap_sv;
4004 int i;
4005
4006 sva = SvRV (sva);
4007 svb = SvRV (svb);
3819 4008
3820 if (current == coro) 4009 if (current == coro)
3821 SWAP_SVS (current); 4010 SWAP_SVS_LEAVE (current);
3822 4011
3823 if (!coro->swap_sv) 4012 if (!coro->swap_sv)
3824 coro->swap_sv = newAV (); 4013 coro->swap_sv = newAV ();
3825 4014
4015 swap_sv = coro->swap_sv;
4016
4017 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4018 {
4019 SV *a = AvARRAY (swap_sv)[i ];
4020 SV *b = AvARRAY (swap_sv)[i + 1];
4021
4022 if (a == sva && b == svb)
4023 {
4024 SvREFCNT_dec_NN (a);
4025 SvREFCNT_dec_NN (b);
4026
4027 for (; i <= AvFILLp (swap_sv) - 2; i++)
4028 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4029
4030 AvFILLp (swap_sv) -= 2;
4031
4032 goto removed;
4033 }
4034 }
4035
3826 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4036 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3827 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4037 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4038
4039 removed:
3828 4040
3829 if (current == coro) 4041 if (current == coro)
3830 SWAP_SVS (current); 4042 SWAP_SVS_ENTER (current);
3831} 4043}
3832 4044
3833 4045
3834MODULE = Coro::State PACKAGE = Coro 4046MODULE = Coro::State PACKAGE = Coro
3835 4047
3836BOOT: 4048BOOT:
3837{ 4049{
4050 if (SVt_LAST > 32)
4051 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4052
3838 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4053 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3839 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4054 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3840 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4055 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3841 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4056 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3842 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4057 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3868 coroapi.ready = api_ready; 4083 coroapi.ready = api_ready;
3869 coroapi.is_ready = api_is_ready; 4084 coroapi.is_ready = api_is_ready;
3870 coroapi.nready = coro_nready; 4085 coroapi.nready = coro_nready;
3871 coroapi.current = coro_current; 4086 coroapi.current = coro_current;
3872 4087
4088 coroapi.enterleave_hook = api_enterleave_hook;
4089 coroapi.enterleave_unhook = api_enterleave_unhook;
4090 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4091
3873 /*GCoroAPI = &coroapi;*/ 4092 /*GCoroAPI = &coroapi;*/
3874 sv_setiv (sv, (IV)&coroapi); 4093 sv_setiv (sv, (IV)&coroapi);
3875 SvREADONLY_on (sv); 4094 SvREADONLY_on (sv);
3876 } 4095 }
3877} 4096}
3942 4161
3943void 4162void
3944_set_current (SV *current) 4163_set_current (SV *current)
3945 PROTOTYPE: $ 4164 PROTOTYPE: $
3946 CODE: 4165 CODE:
3947 SvREFCNT_dec (SvRV (coro_current)); 4166 SvREFCNT_dec_NN (SvRV (coro_current));
3948 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4167 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3949 4168
3950void 4169void
3951_set_readyhook (SV *hook) 4170_set_readyhook (SV *hook)
3952 PROTOTYPE: $ 4171 PROTOTYPE: $
4036 4255
4037 if ((SV *)hv == &PL_sv_undef) 4256 if ((SV *)hv == &PL_sv_undef)
4038 { 4257 {
4039 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4258 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4040 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4259 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4041 SvREFCNT_dec (sv); 4260 SvREFCNT_dec_NN (sv);
4042 } 4261 }
4043 4262
4044 { 4263 {
4045 struct coro *coro = SvSTATE_hv (hv); 4264 struct coro *coro = SvSTATE_hv (hv);
4046 4265
4053 api_ready (aTHX_ (SV *)hv); 4272 api_ready (aTHX_ (SV *)hv);
4054 4273
4055 if (GIMME_V != G_VOID) 4274 if (GIMME_V != G_VOID)
4056 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4275 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4057 else 4276 else
4058 SvREFCNT_dec (hv); 4277 SvREFCNT_dec_NN (hv);
4059} 4278}
4060 4279
4061SV * 4280SV *
4062rouse_cb () 4281rouse_cb ()
4063 PROTOTYPE: 4282 PROTOTYPE:
4142 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4361 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4143 OUTPUT: 4362 OUTPUT:
4144 RETVAL 4363 RETVAL
4145 4364
4146void 4365void
4147up (SV *self, int adjust = 1) 4366up (SV *self)
4148 ALIAS:
4149 adjust = 1
4150 CODE: 4367 CODE:
4368 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4369
4370void
4371adjust (SV *self, int adjust)
4372 CODE:
4151 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4373 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4152 4374
4153void 4375void
4154down (...) 4376down (...)
4155 CODE: 4377 CODE:
4156 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4378 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4318 { 4540 {
4319 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4541 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4320 coro_old_pp_sselect = 0; 4542 coro_old_pp_sselect = 0;
4321 } 4543 }
4322 4544
4545MODULE = Coro::State PACKAGE = Coro::Util
4546
4547void
4548_exit (int code)
4549 CODE:
4550 _exit (code);
4551
4552NV
4553time ()
4554 CODE:
4555 RETVAL = nvtime (aTHX);
4556 OUTPUT:
4557 RETVAL
4558
4559NV
4560gettimeofday ()
4561 PPCODE:
4562{
4563 UV tv [2];
4564 u2time (aTHX_ tv);
4565 EXTEND (SP, 2);
4566 PUSHs (sv_2mortal (newSVuv (tv [0])));
4567 PUSHs (sv_2mortal (newSVuv (tv [1])));
4568}
4569

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines