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.425 by root, Wed Dec 5 00:14:22 2012 UTC vs.
Revision 1.479 by root, Thu Jun 24 19:10:06 2021 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
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
7 27
8#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 29#define PERL_EXT
10 30
11#include "EXTERN.h" 31#include "EXTERN.h"
14#include "perliol.h" 34#include "perliol.h"
15 35
16#include "schmorp.h" 36#include "schmorp.h"
17 37
18#define ECB_NO_THREADS 1 38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
19#include "ecb.h" 40#include "ecb.h"
20 41
21#include <stddef.h> 42#include <stddef.h>
22#include <stdio.h> 43#include <stdio.h>
23#include <errno.h> 44#include <errno.h>
24#include <assert.h> 45#include <assert.h>
25 46
47#ifndef SvREFCNT_dec_NN
48 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
49#endif
50
51#ifndef SvREFCNT_inc_NN
52 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
53#endif
54
26#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 56# define SVs_PADSTALE 0
28#endif 57#endif
29 58
30#ifdef PadARRAY 59#ifdef PadARRAY
31# define NEWPADAPI 60# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *)) 61# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else 62#else
34typedef AV PADNAMELIST; 63typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0) 64# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST; 65typedef AV PADLIST;
41# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 70# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY 71# define PadARRAY AvARRAY
43# define PadMAX AvFILLp 72# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 73# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif 74#endif
75#ifndef PadnamelistREFCNT
76# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
77#endif
78#ifndef PadnamelistREFCNT_dec
79# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
80#endif
81
82/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
84#if PERL_VERSION_ATLEAST(5,19,0)
85# define SVt_BIND SVt_IV
86#endif
46 87
47#if defined(_WIN32) 88#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY 89# undef HAS_GETTIMEOFDAY
49# undef setjmp 90# undef setjmp
50# undef longjmp 91# undef longjmp
52# define setjmp _setjmp /* deep magic */ 93# define setjmp _setjmp /* deep magic */
53#else 94#else
54# include <inttypes.h> /* most portable stdint.h */ 95# include <inttypes.h> /* most portable stdint.h */
55#endif 96#endif
56 97
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 */ 98/* the maximum number of idle cctx that will be pooled */
85static int cctx_max_idle = 4; 99static int cctx_max_idle = 4;
86 100
87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 101#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
88# define HAS_SCOPESTACK_NAME 1 102# 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 103#endif
98 104
99/* prefer perl internal functions over our own? */ 105/* prefer perl internal functions over our own? */
100#ifndef CORO_PREFER_PERL_FUNCTIONS 106#ifndef CORO_PREFER_PERL_FUNCTIONS
101# define CORO_PREFER_PERL_FUNCTIONS 0 107# define CORO_PREFER_PERL_FUNCTIONS 0
130# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
131# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
132# endif 138# endif
133#endif 139#endif
134 140
141/* one off bugfix for perl 5.22 */
142#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
143# undef PadlistNAMES
144# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
145#endif
146
147#if PERL_VERSION_ATLEAST(5,24,0)
148# define SUB_ARGARRAY PL_curpad[0]
149#else
150# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
151#endif
152
153/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
154#if 0
155# undef NDEBUG
156# include <assert.h>
157#endif
158
135static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
136static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
137 161
138/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
139#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
154 178
155static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
156static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
157static SV *rv_diehook; 181static SV *rv_diehook;
158static SV *rv_warnhook; 182static SV *rv_warnhook;
159static HV *hv_sig; /* %SIG */
160 183
161/* async_pool helper stuff */ 184/* async_pool helper stuff */
162static SV *sv_pool_rss; 185static SV *sv_pool_rss;
163static SV *sv_pool_size; 186static SV *sv_pool_size;
164static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
192typedef struct coro_cctx 215typedef struct coro_cctx
193{ 216{
194 struct coro_cctx *next; 217 struct coro_cctx *next;
195 218
196 /* the stack */ 219 /* the stack */
197 void *sptr; 220 struct coro_stack stack;
198 size_t ssize;
199 221
200 /* cpu state */ 222 /* cpu state */
201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 223 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG 224#ifndef NDEBUG
203 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 225 JMPENV *idle_te; /* same as idle_sp, but for top_env */
261 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
262 284
263 /* coro process data */ 285 /* coro process data */
264 int prio; 286 int prio;
265 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
266 SV *rouse_cb; /* last rouse callback */ 288 SV *rouse_cb; /* most recently created rouse callback */
267 AV *on_destroy; /* callbacks or coros to notify on destroy */ 289 AV *on_destroy; /* callbacks or coros to notify on destroy */
268 AV *status; /* the exit status list */ 290 AV *status; /* the exit status list */
269 291
270 /* async_pool */ 292 /* async_pool */
271 SV *saved_deffh; 293 SV *saved_deffh;
272 SV *invoke_cb; 294 SV *invoke_cb;
273 AV *invoke_av; 295 AV *invoke_av;
274 296
275 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
276 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
277 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
278 300
279 /* swap_sv */ 301 /* swap_sv */
280 AV *swap_sv; 302 AV *swap_sv;
281 303
282 /* times */ 304 /* times */
312#define coro_nready coroapi.nready 334#define coro_nready coroapi.nready
313 335
314/** JIT *********************************************************************/ 336/** JIT *********************************************************************/
315 337
316#if CORO_JIT 338#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */ 339 /* APPLE doesn't have mmap though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 340 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE 341 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY 342 #if ECB_AMD64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix" 343 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY 344 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix" 345 #define CORO_JIT_TYPE "x86-unix"
324 #endif 346 #endif
325 #endif 347 #endif
326#endif 348#endif
327 349
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 350#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
329 #undef CORO_JIT 351 #undef CORO_JIT
330#endif 352#endif
331 353
332#if CORO_JIT 354#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *); 355 typedef void (*load_save_perl_slots_type)(perl_slots *);
518 540
519 return 0; 541 return 0;
520} 542}
521 543
522ecb_inline struct coro * 544ecb_inline struct coro *
523SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
524{ 546{
525 MAGIC *mg; 547 MAGIC *mg;
526 548
527 if (SvROK (coro)) 549 if (SvROK (coro_sv))
528 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
529 551
530 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
531 if (!mg) 553 if (!mg)
532 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
533 555
534 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
535} 557}
546ecb_inline PADLIST * 568ecb_inline PADLIST *
547coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
548{ 570{
549 PADLIST *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
550 PADLIST *newpadlist; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
551 PAD *newpad; 574 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1; 575 PADOFFSET off = PadlistMAX (padlist) + 1;
553 576
554 newPADLIST(newpadlist); 577#if NEWPADAPI
555#if !PERL_VERSION_ATLEAST(5,15,3) 578
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 579 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
557 AvREAL_off (newpadlist); 580 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
558#endif 581 while (!PadlistARRAY (padlist)[off - 1])
582 --off;
583
584 Perl_pad_push (aTHX_ padlist, off);
585
586 newpad = PadlistARRAY (padlist)[off];
587 PadlistARRAY (padlist)[off] = 0;
588
589#else
590
559#if PERL_VERSION_ATLEAST (5,10,0) 591#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off); 592 Perl_pad_push (aTHX_ padlist, off);
561#else 593#else
562 Perl_pad_push (aTHX_ padlist, off, 1); 594 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif 595#endif
596
564 newpad = PadlistARRAY (padlist)[off]; 597 newpad = PadlistARRAY (padlist)[off];
565 PadlistMAX (padlist) = off - 1; 598 PadlistMAX (padlist) = off - 1;
566 599
600#endif
601
602 newPADLIST (newpadlist);
603#if !PERL_VERSION_ATLEAST(5,15,3)
604 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
605 AvREAL_off (newpadlist);
606#endif
607
567 /* Already extended to 2 elements by newPADLIST. */ 608 /* Already extended to 2 elements by newPADLIST. */
568 PadlistMAX (newpadlist) = 1; 609 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
570 PadlistARRAY (newpadlist)[1] = newpad; 615 PadlistARRAY (newpadlist)[1] = newpad;
571 616
572 return newpadlist; 617 return newpadlist;
573} 618}
574 619
582 627
583 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
584 { 629 {
585 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
586 PAD *pad = PadlistARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
632
633 if (pad)
634 {
587 I32 j = PadMAX (pad); 635 I32 j = PadMAX (pad);
588 636
589 while (j >= 0) 637 while (j >= 0)
590 SvREFCNT_dec (PadARRAY (pad)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
591 639
592 PadMAX (pad) = -1; 640 PadMAX (pad) = -1;
593 SvREFCNT_dec (pad); 641 SvREFCNT_dec (pad);
642 }
594 } 643 }
595 644
596 SvREFCNT_dec (PadlistNAMES (padlist)); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
597 646
598#ifdef NEWPADAPI 647#if NEWPADAPI
599 Safefree (PadlistARRAY (padlist)); 648 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist); 649 Safefree (padlist);
601#else 650#else
602 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist); 652 AvREAL_off (padlist);
697 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 746 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
698 747
699 /* if SvANY points to the head, we need to adjust the pointers, 748 /* if SvANY points to the head, we need to adjust the pointers,
700 * as the pointer for a still points to b, and maybe vice versa. 749 * as the pointer for a still points to b, and maybe vice versa.
701 */ 750 */
702 #define svany_in_head(type) \ 751 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))) 752 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
753 svany_in_head_set |= 1 << SVt_NV;
754 #endif
755
756 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
704 757
705 if (svany_in_head (SvTYPE (a))) 758 if (svany_in_head (SvTYPE (a)))
706 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
707 760
708 if (svany_in_head (SvTYPE (b))) 761 if (svany_in_head (SvTYPE (b)))
711#endif 764#endif
712} 765}
713 766
714/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
715static void 768static void
716swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
717{ 770{
718 int i; 771 int i;
719 772
720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
721 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
722} 775}
723 776
777static void
778swap_svs_leave (pTHX_ Coro__State c)
779{
780 int i;
781
782 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
783 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
784}
785
724#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
725 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
726 swap_svs (aTHX_ (coro)) 788 swap_svs_enter (aTHX_ (coro))
789
790#define SWAP_SVS_LEAVE(coro) \
791 if (ecb_expect_false ((coro)->swap_sv)) \
792 swap_svs_leave (aTHX_ (coro))
727 793
728static void 794static void
729on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
730 796
731static void 797static void
776 842
777 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
779 } 845 }
780 846
847 if (ecb_expect_false (c->on_enter_xs))
848 {
849 int i;
850
851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
852 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
853 }
854
781 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
782} 856}
783 857
784static void 858static void
785save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
786{ 860{
787 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
862
863 if (ecb_expect_false (c->on_leave_xs))
864 {
865 int i;
866
867 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
868 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
869 }
788 870
789 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
790 { 872 {
791 int i; 873 int i;
792 874
919#endif 1001#endif
920 1002
921 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
922 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
923 PL_savestack_max = 24; 1005 PL_savestack_max = 24;
1006#if PERL_VERSION_ATLEAST (5,24,0)
1007 /* perl 5.24 moves SS_MAXPUSH optimisation from */
1008 /* the header macros to PL_savestack_max */
1009 PL_savestack_max -= SS_MAXPUSH;
1010#endif
924 1011
925#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
926 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
927 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
928 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
994 } 1081 }
995 1082
996 return rss; 1083 return rss;
997} 1084}
998 1085
999/** coroutine stack handling ************************************************/ 1086/** 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 1087
1005/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
1006#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
1007#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1008 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1009 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
1010#endif 1093#endif
1094
1095/* this will be a patched copy of PL_vtbl_sigelem */
1096static MGVTBL coro_sigelem_vtbl;
1097
1098static int ecb_cold
1099coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1100{
1101 char *key = SvPV_nolen ((SV *)name);
1102
1103 /* do what mg_copy normally does */
1104 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1105 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1106
1107 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1108 if (*key == '_'
1109 && (strEQ (key, "__DIE__")
1110 || strEQ (key, "__WARN__")))
1111 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1112
1113 return 1;
1114}
1115
1116/* perl does not have a %SIG vtbl, we provide one so we can override */
1117/* the magic vtbl for the __DIE__ and __WARN__ members */
1118static const MGVTBL coro_sig_vtbl = {
1119 0, 0, 0, 0, 0,
1120 coro_sig_copy
1121};
1011 1122
1012/* 1123/*
1013 * This overrides the default magic get method of %SIG elements. 1124 * 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 1125 * 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), 1126 * and instead of trying to save and restore the hash elements (extremely slow),
1017 */ 1128 */
1018static int ecb_cold 1129static int ecb_cold
1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1020{ 1131{
1021 const char *s = MgPV_nolen_const (mg); 1132 const char *s = MgPV_nolen_const (mg);
1133 /* the key must be either __DIE__ or __WARN__ here */
1134 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1022 1135
1023 if (*s == '_') 1136 SV *ssv;
1024 {
1025 SV **svp = 0;
1026 1137
1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1029
1030 if (svp) 1138 if (!*svp)
1031 {
1032 SV *ssv;
1033
1034 if (!*svp)
1035 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1036 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1037 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1038 else 1142 else
1039 ssv = *svp; 1143 ssv = *svp;
1040 1144
1041 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1042 return 0; 1146 return 0;
1043 }
1044 }
1045
1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1047} 1147}
1048 1148
1049static int ecb_cold 1149static int ecb_cold
1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1051{ 1151{
1052 const char *s = MgPV_nolen_const (mg); 1152 const char *s = MgPV_nolen_const (mg);
1153 /* the key must be either __DIE__ or __WARN__ here */
1154 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1053 1155
1054 if (*s == '_')
1055 {
1056 SV **svp = 0;
1057
1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1060
1061 if (svp)
1062 {
1063 SV *old = *svp; 1156 SV *old = *svp;
1064 *svp = 0; 1157 *svp = 0;
1065 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1066 return 0; 1159 return 0;
1067 }
1068 }
1069
1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1071} 1160}
1072 1161
1073static int ecb_cold 1162static int ecb_cold
1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1075{ 1164{
1076 const char *s = MgPV_nolen_const (mg); 1165 const char *s = MgPV_nolen_const (mg);
1166 /* the key must be either __DIE__ or __WARN__ here */
1167 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1077 1168
1078 if (*s == '_')
1079 {
1080 SV **svp = 0;
1081
1082 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1083 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1084
1085 if (svp)
1086 {
1087 SV *old = *svp; 1169 SV *old = *svp;
1088 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1089 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1090 return 0; 1172 return 0;
1091 }
1092 }
1093
1094 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1095} 1173}
1096 1174
1097static void 1175static void
1098prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1099{ 1177{
1110static int 1188static int
1111slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1112{ 1190{
1113 return 1; 1191 return 1;
1114} 1192}
1193
1194/** coroutine stack handling ************************************************/
1115 1195
1116static UNOP init_perl_op; 1196static UNOP init_perl_op;
1117 1197
1118ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1198ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1119init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
1145 1225
1146 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1147 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1148 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1229 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1150 GvHV (PL_hintgv) = 0; 1230 GvHV (PL_hintgv) = newHV ();
1231#if PERL_VERSION_ATLEAST (5,10,0)
1232 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1233#endif
1151 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1152 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1153 1236
1154 { 1237 {
1155 dSP; 1238 dSP;
1159 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1160 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1161 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1162 1245
1163 PUSHMARK (SP); 1246 PUSHMARK (SP);
1164 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1165 PUTBACK; 1248 PUTBACK;
1166 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1167 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1168 } 1251 }
1169 1252
1183 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1184 1267
1185 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1186 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1187 1270
1188 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1189 1272
1190 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1191 { 1274 {
1192 coro_times_update (); 1275 coro_times_update ();
1193 coro_times_sub (coro); 1276 coro_times_sub (coro);
1226 1309
1227 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1310 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1228 1311
1229 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1230 1313
1231 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block */
1232 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1233 1316
1234 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1235 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1236 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1237
1238 /* restore swapped sv's */
1239 SWAP_SVS (coro);
1240 1323
1241 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1242 1325
1243 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1244 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1265 1348
1266 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1267 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1268 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1269 SvREFCNT_dec (coro->invoke_av); 1352 SvREFCNT_dec (coro->invoke_av);
1353 SvREFCNT_dec (coro->on_enter_xs);
1354 SvREFCNT_dec (coro->on_leave_xs);
1270 } 1355 }
1271} 1356}
1272 1357
1273ecb_inline void 1358ecb_inline void
1274free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1315 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1316 1401
1317 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1318 ENTER; 1403 ENTER;
1319 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1320 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1321 PUSHMARK (SP);
1322 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1323 PUSHs (fullname); 1408 PUSHs (fullname);
1324 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1325 PUTBACK; 1410 PUTBACK;
1326 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1411 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1337 1422
1338 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1339 { 1424 {
1340 SV **cb; 1425 SV **cb;
1341 1426
1342 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1343 { 1428 {
1344 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1345 1430
1346 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1347 { 1432 {
1353 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1354 1439
1355 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1356 ENTER; 1441 ENTER;
1357 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1358 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1359 PUSHMARK (SP);
1360 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1361 PUSHs (fullname); 1446 PUSHs (fullname);
1362 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1447 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1363 PUTBACK; 1448 PUTBACK;
1364 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1449 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1365 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1450 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1366 SPAGAIN; 1451 SPAGAIN;
1367 FREETMPS; 1452 FREETMPS;
1377 dSP; 1462 dSP;
1378 1463
1379 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1380 ENTER; 1465 ENTER;
1381 SAVETMPS; 1466 SAVETMPS;
1382 EXTEND (SP, 3);
1383 PL_runops = RUNOPS_DEFAULT;
1384 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1385 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1386 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1387 PUTBACK; 1471 PUTBACK;
1388 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1472 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1389 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1473 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1489 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1573 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1490 * runtime errors here, as this is just a random interpreter, not a thread. 1574 * runtime errors here, as this is just a random interpreter, not a thread.
1491 */ 1575 */
1492 1576
1493 /* 1577 /*
1578 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1579 * requires PL_scopestack_ix, so do it here if required.
1580 */
1581 if (!PL_scopestack_ix)
1582 ENTER;
1583
1584 /*
1494 * If perl-run returns we assume exit() was being called or the coro 1585 * If perl-run returns we assume exit() was being called or the coro
1495 * fell off the end, which seems to be the only valid (non-bug) 1586 * fell off the end, which seems to be the only valid (non-bug)
1496 * reason for perl_run to return. We try to mimic whatever perl is normally 1587 * reason for perl_run to return. We try to mimic whatever perl is normally
1497 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1498 */ 1589 */
1519static coro_cctx * 1610static coro_cctx *
1520cctx_new_empty (void) 1611cctx_new_empty (void)
1521{ 1612{
1522 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1523 1614
1524 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1525 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1526 1617
1527 return cctx; 1618 return cctx;
1528} 1619}
1529 1620
1530/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1531static coro_cctx * 1622static coro_cctx *
1532cctx_new_run (void) 1623cctx_new_run (void)
1533{ 1624{
1534 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1535 void *stack_start;
1536 size_t stack_size;
1537 1626
1538#if HAVE_MMAP 1627 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 } 1628 {
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."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1561 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1562 }
1563
1564 stack_start = cctx->sptr;
1565 stack_size = cctx->ssize;
1566 } 1631 }
1567 1632
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); 1633 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1573 1634
1574 return cctx; 1635 return cctx;
1575} 1636}
1576 1637
1577static void 1638static void
1583 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1584 1645
1585 --cctx_count; 1646 --cctx_count;
1586 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1587 1648
1588 /* coro_transfer creates new, empty cctx's */ 1649 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 1650
1603 Safefree (cctx); 1651 Safefree (cctx);
1604} 1652}
1605 1653
1606/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1625} 1673}
1626 1674
1627static void 1675static void
1628cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1629{ 1677{
1630 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1678 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1631 1679
1632 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1633 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1634 { 1682 {
1635 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1811 1859
1812static int ecb_cold 1860static int ecb_cold
1813coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1814{ 1862{
1815 /* called when perl clones the current process the slow way (windows process emulation) */ 1863 /* called when perl clones the current process the slow way (windows process emulation) */
1816 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1864 /* we simply nuke the pointers in the copy, causing perl to croak */
1817 mg->mg_ptr = 0; 1865 mg->mg_ptr = 0;
1818 mg->mg_virtual = 0; 1866 mg->mg_virtual = 0;
1819 1867
1820 return 0; 1868 return 0;
1821} 1869}
1967 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
1968 if (SvROK (sv_idle) 2016 if (SvROK (sv_idle)
1969 && SvOBJECT (SvRV (sv_idle))) 2017 && SvOBJECT (SvRV (sv_idle)))
1970 { 2018 {
1971 if (SvRV (sv_idle) == SvRV (coro_current)) 2019 if (SvRV (sv_idle) == SvRV (coro_current))
2020 {
2021 require_pv ("Carp");
2022
2023 {
2024 dSP;
2025
2026 ENTER;
2027 SAVETMPS;
2028
2029 PUSHMARK (SP);
1972 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2030 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2031 PUTBACK;
2032 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2033
2034 FREETMPS;
2035 LEAVE;
2036 }
2037 }
1973 2038
1974 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2039 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1975 api_ready (aTHX_ SvRV (sv_idle)); 2040 api_ready (aTHX_ SvRV (sv_idle));
1976 --coro_nready; 2041 --coro_nready;
1977 } 2042 }
2175 AV *od = coro->on_destroy; 2240 AV *od = coro->on_destroy;
2176 2241
2177 if (!od) 2242 if (!od)
2178 return; 2243 return;
2179 2244
2245 coro->on_destroy = 0;
2246 sv_2mortal ((SV *)od);
2247
2180 while (AvFILLp (od) >= 0) 2248 while (AvFILLp (od) >= 0)
2181 { 2249 {
2182 SV *cb = sv_2mortal (av_pop (od)); 2250 SV *cb = sv_2mortal (av_pop (od));
2183 2251
2184 /* coro hv's (and only hv's at the moment) are supported as well */ 2252 /* coro hv's (and only hv's at the moment) are supported as well */
2278 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2279 } 2347 }
2280 else 2348 else
2281 { 2349 {
2282 struct coro *self = SvSTATE_current; 2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2283 2354
2284 /* otherwise we cancel directly, purely for speed reasons 2355 /* otherwise we cancel directly, purely for speed reasons
2285 * unfortunately, this requires some magic trickery, as 2356 * unfortunately, this requires some magic trickery, as
2286 * somebody else could cancel us, so we have to fight the cancellation. 2357 * somebody else could cancel us, so we have to fight the cancellation.
2287 * this is ugly, and hopefully fully worth the extra speed. 2358 * this is ugly, and hopefully fully worth the extra speed.
2320safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2321{ 2392{
2322 if (coro->cctx) 2393 if (coro->cctx)
2323 croak ("coro inside C callback, unable to cancel at this time, caught"); 2394 croak ("coro inside C callback, unable to cancel at this time, caught");
2324 2395
2325 if (coro->flags & CF_NEW) 2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2326 { 2397 {
2327 coro_set_status (aTHX_ coro, arg, items); 2398 coro_set_status (aTHX_ coro, arg, items);
2328 coro_state_destroy (aTHX_ coro); 2399 coro_state_destroy (aTHX_ coro);
2329 } 2400 }
2330 else 2401 else
2397 else 2468 else
2398 { 2469 {
2399 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2400 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2471 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2401 2472
2473 if (ecb_expect_false (coro->swap_sv))
2474 {
2475 SWAP_SVS_LEAVE (coro);
2476 SvREFCNT_dec_NN (coro->swap_sv);
2477 coro->swap_sv = 0;
2478 }
2479
2402 coro->prio = 0; 2480 coro->prio = 0;
2403 2481
2404 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2405 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2406 2484
2407 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2408 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2409 } 2487 }
2410 } 2488 }
2411 else 2489 else
2412 { 2490 {
2413 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
2426static void 2504static void
2427coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2428{ 2506{
2429 dXSARGS; 2507 dXSARGS;
2430 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2509 SV *coro = SvRV (data);
2431 2510
2511 /* data starts being either undef or a coro, and is replaced by the results when done */
2432 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2512 if (SvTYPE (coro) != SVt_PVAV)
2433 { 2513 {
2434 /* first call, set args */ 2514 /* first call, set args */
2435 SV *coro = SvRV (data);
2436 AV *av = newAV ();
2437 2515
2438 SvRV_set (data, (SV *)av); 2516 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2517 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2439 2518
2440 /* better take a full copy of the arguments */ 2519 if (coro != &PL_sv_undef)
2441 while (items--) 2520 {
2442 av_store (av, items, newSVsv (ST (items)));
2443
2444 api_ready (aTHX_ coro); 2521 api_ready (aTHX_ coro);
2445 SvREFCNT_dec (coro); 2522 SvREFCNT_dec_NN (coro);
2523 }
2446 } 2524 }
2447 2525
2448 XSRETURN_EMPTY; 2526 XSRETURN_EMPTY;
2449} 2527}
2450 2528
2467 2545
2468 EXTEND (SP, AvFILLp (av) + 1); 2546 EXTEND (SP, AvFILLp (av) + 1);
2469 for (i = 0; i <= AvFILLp (av); ++i) 2547 for (i = 0; i <= AvFILLp (av); ++i)
2470 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2548 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2471 2549
2472 /* we have stolen the elements, so set length to zero and free */ 2550 /* we have stolen the elements, make it unreal and free */
2473 AvFILLp (av) = -1; 2551 AvREAL_off (av);
2474 av_undef (av); 2552 av_undef (av);
2475 2553
2476 PUTBACK; 2554 PUTBACK;
2477 } 2555 }
2478 2556
2503 croak ("Coro::rouse_wait called with illegal callback argument,"); 2581 croak ("Coro::rouse_wait called with illegal callback argument,");
2504 2582
2505 { 2583 {
2506 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2584 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2507 SV *data = (SV *)S_GENSUB_ARG; 2585 SV *data = (SV *)S_GENSUB_ARG;
2586 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2587
2588 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2589 if (!data_ready)
2590 if (SvRV (data) != &PL_sv_undef)
2591 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2592 else
2593 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2508 2594
2509 frame->data = (void *)data; 2595 frame->data = (void *)data;
2510 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2596 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2511 frame->check = slf_check_rouse_wait; 2597 frame->check = slf_check_rouse_wait;
2512 } 2598 }
2513} 2599}
2514 2600
2515static SV * 2601static SV *
2516coro_new_rouse_cb (pTHX) 2602coro_new_rouse_cb (pTHX)
2517{ 2603{
2518 HV *hv = (HV *)SvRV (coro_current); 2604 HV *hv = (HV *)SvRV (coro_current);
2519 struct coro *coro = SvSTATE_hv (hv); 2605 struct coro *coro = SvSTATE_hv (hv);
2520 SV *data = newRV_inc ((SV *)hv); 2606 SV *data = newRV_noinc (&PL_sv_undef);
2521 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2607 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2522 2608
2523 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2609 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2524 SvREFCNT_dec (data); /* magicext increases the refcount */ 2610 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2525 2611
2526 SvREFCNT_dec (coro->rouse_cb); 2612 SvREFCNT_dec (coro->rouse_cb);
2527 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2613 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2528 2614
2529 return cb; 2615 return cb;
2629 2715
2630/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2716/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2631static void 2717static void
2632slf_destroy (pTHX_ struct coro *coro) 2718slf_destroy (pTHX_ struct coro *coro)
2633{ 2719{
2634 /* this callback is reserved for slf functions needing to do cleanup */ 2720 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 2721
2638 /* 2722 /*
2639 * The on_destroy above most likely is from an SLF call. 2723 * The on_destroy below most likely is from an SLF call.
2640 * Since by definition the SLF call will not finish when we destroy 2724 * Since by definition the SLF call will not finish when we destroy
2641 * the coro, we will have to force-finish it here, otherwise 2725 * the coro, we will have to force-finish it here, otherwise
2642 * cleanup functions cannot call SLF functions. 2726 * cleanup functions cannot call SLF functions.
2643 */ 2727 */
2644 coro->slf_frame.prepare = 0; 2728 coro->slf_frame.prepare = 0;
2729
2730 /* this callback is reserved for slf functions needing to do cleanup */
2731 if (frame.destroy && frame.prepare && !PL_dirty)
2732 frame.destroy (aTHX_ &frame);
2645} 2733}
2646 2734
2647/* 2735/*
2648 * these not obviously related functions are all rolled into one 2736 * these not obviously related functions are all rolled into one
2649 * function to increase chances that they all will call transfer with the same 2737 * function to increase chances that they all will call transfer with the same
2832static void 2920static void
2833coro_pop_on_leave (pTHX_ void *coro) 2921coro_pop_on_leave (pTHX_ void *coro)
2834{ 2922{
2835 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2923 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2836 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2924 on_enterleave_call (aTHX_ sv_2mortal (cb));
2925}
2926
2927static void
2928enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2929{
2930 if (!hook)
2931 return;
2932
2933 if (!*avp)
2934 {
2935 *avp = newAV ();
2936 AvREAL_off (*avp);
2937 }
2938
2939 av_push (*avp, (SV *)hook);
2940 av_push (*avp, (SV *)arg);
2941}
2942
2943static void
2944enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2945{
2946 AV *av = *avp;
2947 int i;
2948
2949 if (!av)
2950 return;
2951
2952 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2953 if (AvARRAY (av)[i] == (SV *)hook)
2954 {
2955 if (execute)
2956 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2957
2958 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2959 av_pop (av);
2960 av_pop (av);
2961 break;
2962 }
2963
2964 if (AvFILLp (av) >= 0)
2965 {
2966 *avp = 0;
2967 SvREFCNT_dec_NN (av);
2968 }
2969}
2970
2971static void
2972api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 struct coro *coro = SvSTATE (coro_sv);
2975
2976 if (SvSTATE_current == coro)
2977 if (enter)
2978 enter (aTHX_ enter_arg);
2979
2980 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2982}
2983
2984static void
2985api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2986{
2987 struct coro *coro = SvSTATE (coro_sv);
2988
2989 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2991}
2992
2993static void
2994savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2995{
2996 struct coro *coro = SvSTATE_current;
2997
2998 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2999}
3000
3001static void
3002savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3003{
3004 struct coro *coro = SvSTATE_current;
3005
3006 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3007}
3008
3009static void
3010api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3011{
3012 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3013
3014 /* this ought to be much cheaper than malloc + a single destructor call */
3015 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3016 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2837} 3017}
2838 3018
2839/*****************************************************************************/ 3019/*****************************************************************************/
2840/* PerlIO::cede */ 3020/* PerlIO::cede */
2841 3021
2971 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3151 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2972 PUTBACK; 3152 PUTBACK;
2973 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3153 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2974 } 3154 }
2975 3155
2976 SvREFCNT_dec (cb); 3156 SvREFCNT_dec_NN (cb);
2977 } 3157 }
2978} 3158}
2979 3159
2980static void 3160static void
2981coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3161coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2989{ 3169{
2990 AV *av = (AV *)frame->data; 3170 AV *av = (AV *)frame->data;
2991 SV *count_sv = AvARRAY (av)[0]; 3171 SV *count_sv = AvARRAY (av)[0];
2992 SV *coro_hv = SvRV (coro_current); 3172 SV *coro_hv = SvRV (coro_current);
2993 3173
3174 frame->destroy = 0;
3175
2994 /* if we are about to throw, don't actually acquire the lock, just throw */ 3176 /* if we are about to throw, don't actually acquire the lock, just throw */
2995 if (CORO_THROW) 3177 if (ecb_expect_false (CORO_THROW))
3178 {
3179 /* we still might be responsible for the semaphore, so wake up others */
3180 coro_semaphore_adjust (aTHX_ av, 0);
3181
2996 return 0; 3182 return 0;
3183 }
2997 else if (SvIVX (count_sv) > 0) 3184 else if (SvIVX (count_sv) > 0)
2998 { 3185 {
2999 frame->destroy = 0;
3000
3001 if (acquire) 3186 if (acquire)
3002 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3187 SvIVX (count_sv) = SvIVX (count_sv) - 1;
3003 else 3188 else
3004 coro_semaphore_adjust (aTHX_ av, 0); 3189 coro_semaphore_adjust (aTHX_ av, 0);
3005 3190
3116 { 3301 {
3117 api_ready (aTHX_ cb); 3302 api_ready (aTHX_ cb);
3118 sv_setiv (cb, 0); /* signal waiter */ 3303 sv_setiv (cb, 0); /* signal waiter */
3119 } 3304 }
3120 3305
3121 SvREFCNT_dec (cb); 3306 SvREFCNT_dec_NN (cb);
3122 3307
3123 --count; 3308 --count;
3124 } 3309 }
3125} 3310}
3126 3311
3211 } 3396 }
3212 3397
3213 av_push (state, data_sv); 3398 av_push (state, data_sv);
3214 3399
3215 api_ready (aTHX_ coro); 3400 api_ready (aTHX_ coro);
3216 SvREFCNT_dec (coro); 3401 SvREFCNT_dec_NN (coro);
3217 SvREFCNT_dec ((AV *)state); 3402 SvREFCNT_dec_NN ((AV *)state);
3218} 3403}
3219 3404
3220static int 3405static int
3221slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3406slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3222{ 3407{
3227 /* it quickly returns */ 3412 /* it quickly returns */
3228 if (CORO_THROW) 3413 if (CORO_THROW)
3229 return 0; 3414 return 0;
3230 3415
3231 /* one element that is an RV? repeat! */ 3416 /* one element that is an RV? repeat! */
3232 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3417 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3233 return 1; 3418 return 1;
3234 3419
3235 /* restore status */ 3420 /* restore status */
3236 { 3421 {
3237 SV *data_sv = av_pop (state); 3422 SV *data_sv = av_pop (state);
3240 errno = data->errorno; 3425 errno = data->errorno;
3241 PL_laststype = data->laststype; 3426 PL_laststype = data->laststype;
3242 PL_laststatval = data->laststatval; 3427 PL_laststatval = data->laststatval;
3243 PL_statcache = data->statcache; 3428 PL_statcache = data->statcache;
3244 3429
3245 SvREFCNT_dec (data_sv); 3430 SvREFCNT_dec_NN (data_sv);
3246 } 3431 }
3247 3432
3248 /* push result values */ 3433 /* push result values */
3249 { 3434 {
3250 dSP; 3435 dSP;
3439 3624
3440 map_len = load_len + save_len + 16; 3625 map_len = load_len + save_len + 16;
3441 3626
3442 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3627 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3443 3628
3629 if (map_base == (char *)MAP_FAILED)
3630 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3631
3444 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3632 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3445 3633
3446 load_perl_slots = (load_save_perl_slots_type)map_base; 3634 load_perl_slots = (load_save_perl_slots_type)map_base;
3447 memcpy (map_base, load_ptr, load_len); 3635 memcpy (map_base, load_ptr, load_len);
3448 3636
3465 3653
3466PROTOTYPES: DISABLE 3654PROTOTYPES: DISABLE
3467 3655
3468BOOT: 3656BOOT:
3469{ 3657{
3658#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3659#include "state.h"
3470#ifdef USE_ITHREADS 3660#ifdef USE_ITHREADS
3471# if CORO_PTHREAD 3661# if CORO_PTHREAD
3472 coro_thx = PERL_GET_CONTEXT; 3662 coro_thx = PERL_GET_CONTEXT;
3473# endif 3663# endif
3474#endif 3664#endif
3475 BOOT_PAGESIZE;
3476
3477 /* perl defines these to check for existance first, but why it doesn't */ 3665 /* 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 */ 3666 /* just create them one at init time is not clear to me, except for */
3479 /* programs trying to delete them, but... */ 3667 /* programs trying to delete them, but... */
3480 /* anyway, we declare this as invalid and make sure they are initialised here */ 3668 /* anyway, we declare this as invalid and make sure they are initialised here */
3481 DEFSV; 3669 DEFSV;
3484 cctx_current = cctx_new_empty (); 3672 cctx_current = cctx_new_empty ();
3485 3673
3486 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3674 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3487 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3675 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3488 3676
3489 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3677 {
3490 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3678 /*
3491 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3679 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3680 * by coro_sig_vtbl in hash values.
3681 */
3682 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3683
3684 /* this only works if perl doesn't have a vtbl for %SIG */
3685 assert (!mg->mg_virtual);
3686
3687 /*
3688 * The irony is that the perl API itself asserts that mg_virtual
3689 * must be non-const, yet perl5porters insisted on marking their
3690 * vtbls as read-only, just to thwart perl modules from patching
3691 * them.
3692 */
3693 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3694 mg->mg_flags |= MGf_COPY;
3695
3696 coro_sigelem_vtbl = PL_vtbl_sigelem;
3697 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3698 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3699 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3700 }
3492 3701
3493 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3494 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3702 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3495 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3703 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3496 3704
3497 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3705 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3706
3707 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3498 3708
3499 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3500 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3501 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3502 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
3551void 3761void
3552transfer (...) 3762transfer (...)
3553 PROTOTYPE: $$ 3763 PROTOTYPE: $$
3554 CODE: 3764 CODE:
3555 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3765 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3556
3557void
3558_exit (int code)
3559 PROTOTYPE: $
3560 CODE:
3561 _exit (code);
3562 3766
3563SV * 3767SV *
3564clone (Coro::State coro) 3768clone (Coro::State coro)
3565 CODE: 3769 CODE:
3566{ 3770{
3621void 3825void
3622list () 3826list ()
3623 PROTOTYPE: 3827 PROTOTYPE:
3624 PPCODE: 3828 PPCODE:
3625{ 3829{
3626 struct coro *coro; 3830 struct coro *coro;
3627 for (coro = coro_first; coro; coro = coro->next) 3831 for (coro = coro_first; coro; coro = coro->next)
3628 if (coro->hv) 3832 if (coro->hv)
3629 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3833 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3630} 3834}
3631 3835
3633call (Coro::State coro, SV *coderef) 3837call (Coro::State coro, SV *coderef)
3634 ALIAS: 3838 ALIAS:
3635 eval = 1 3839 eval = 1
3636 CODE: 3840 CODE:
3637{ 3841{
3842 struct coro *current = SvSTATE_current;
3843
3638 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3844 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3639 { 3845 {
3640 struct coro *current = SvSTATE_current;
3641 struct CoroSLF slf_save; 3846 struct CoroSLF slf_save;
3642 3847
3643 if (current != coro) 3848 if (current != coro)
3644 { 3849 {
3645 PUTBACK; 3850 PUTBACK;
3793 3998
3794void 3999void
3795times (Coro::State self) 4000times (Coro::State self)
3796 PPCODE: 4001 PPCODE:
3797{ 4002{
3798 struct coro *current = SvSTATE (coro_current); 4003 struct coro *current = SvSTATE (coro_current);
3799 4004
3800 if (ecb_expect_false (current == self)) 4005 if (ecb_expect_false (current == self))
3801 { 4006 {
3802 coro_times_update (); 4007 coro_times_update ();
3803 coro_times_add (SvSTATE (coro_current)); 4008 coro_times_add (SvSTATE (coro_current));
3810 if (ecb_expect_false (current == self)) 4015 if (ecb_expect_false (current == self))
3811 coro_times_sub (SvSTATE (coro_current)); 4016 coro_times_sub (SvSTATE (coro_current));
3812} 4017}
3813 4018
3814void 4019void
3815swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4020swap_sv (Coro::State coro, SV *sva, SV *svb)
3816 CODE: 4021 CODE:
3817{ 4022{
3818 struct coro *current = SvSTATE_current; 4023 struct coro *current = SvSTATE_current;
4024 AV *swap_sv;
4025 int i;
4026
4027 sva = SvRV (sva);
4028 svb = SvRV (svb);
3819 4029
3820 if (current == coro) 4030 if (current == coro)
3821 SWAP_SVS (current); 4031 SWAP_SVS_LEAVE (current);
3822 4032
3823 if (!coro->swap_sv) 4033 if (!coro->swap_sv)
3824 coro->swap_sv = newAV (); 4034 coro->swap_sv = newAV ();
3825 4035
4036 swap_sv = coro->swap_sv;
4037
4038 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4039 {
4040 SV *a = AvARRAY (swap_sv)[i ];
4041 SV *b = AvARRAY (swap_sv)[i + 1];
4042
4043 if (a == sva && b == svb)
4044 {
4045 SvREFCNT_dec_NN (a);
4046 SvREFCNT_dec_NN (b);
4047
4048 for (; i <= AvFILLp (swap_sv) - 2; i++)
4049 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4050
4051 AvFILLp (swap_sv) -= 2;
4052
4053 goto removed;
4054 }
4055 }
4056
3826 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4057 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3827 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4058 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4059
4060 removed:
3828 4061
3829 if (current == coro) 4062 if (current == coro)
3830 SWAP_SVS (current); 4063 SWAP_SVS_ENTER (current);
3831} 4064}
3832 4065
3833 4066
3834MODULE = Coro::State PACKAGE = Coro 4067MODULE = Coro::State PACKAGE = Coro
3835 4068
3836BOOT: 4069BOOT:
3837{ 4070{
4071 if (SVt_LAST > 32)
4072 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4073
3838 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4074 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3839 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4075 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3840 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4076 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3841 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4077 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3842 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4078 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3868 coroapi.ready = api_ready; 4104 coroapi.ready = api_ready;
3869 coroapi.is_ready = api_is_ready; 4105 coroapi.is_ready = api_is_ready;
3870 coroapi.nready = coro_nready; 4106 coroapi.nready = coro_nready;
3871 coroapi.current = coro_current; 4107 coroapi.current = coro_current;
3872 4108
4109 coroapi.enterleave_hook = api_enterleave_hook;
4110 coroapi.enterleave_unhook = api_enterleave_unhook;
4111 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4112
3873 /*GCoroAPI = &coroapi;*/ 4113 /*GCoroAPI = &coroapi;*/
3874 sv_setiv (sv, (IV)&coroapi); 4114 sv_setiv (sv, PTR2IV (&coroapi));
3875 SvREADONLY_on (sv); 4115 SvREADONLY_on (sv);
3876 } 4116 }
3877} 4117}
3878 4118
3879SV * 4119SV *
3942 4182
3943void 4183void
3944_set_current (SV *current) 4184_set_current (SV *current)
3945 PROTOTYPE: $ 4185 PROTOTYPE: $
3946 CODE: 4186 CODE:
3947 SvREFCNT_dec (SvRV (coro_current)); 4187 SvREFCNT_dec_NN (SvRV (coro_current));
3948 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4188 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3949 4189
3950void 4190void
3951_set_readyhook (SV *hook) 4191_set_readyhook (SV *hook)
3952 PROTOTYPE: $ 4192 PROTOTYPE: $
4036 4276
4037 if ((SV *)hv == &PL_sv_undef) 4277 if ((SV *)hv == &PL_sv_undef)
4038 { 4278 {
4039 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4279 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4040 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4280 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4041 SvREFCNT_dec (sv); 4281 SvREFCNT_dec_NN (sv);
4042 } 4282 }
4043 4283
4044 { 4284 {
4045 struct coro *coro = SvSTATE_hv (hv); 4285 struct coro *coro = SvSTATE_hv (hv);
4046 4286
4053 api_ready (aTHX_ (SV *)hv); 4293 api_ready (aTHX_ (SV *)hv);
4054 4294
4055 if (GIMME_V != G_VOID) 4295 if (GIMME_V != G_VOID)
4056 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4296 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4057 else 4297 else
4058 SvREFCNT_dec (hv); 4298 SvREFCNT_dec_NN (hv);
4059} 4299}
4060 4300
4061SV * 4301SV *
4062rouse_cb () 4302rouse_cb ()
4063 PROTOTYPE: 4303 PROTOTYPE:
4078 on_leave = 1 4318 on_leave = 1
4079 PROTOTYPE: & 4319 PROTOTYPE: &
4080 CODE: 4320 CODE:
4081{ 4321{
4082 struct coro *coro = SvSTATE_current; 4322 struct coro *coro = SvSTATE_current;
4083 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4323 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4084 4324
4085 block = s_get_cv_croak (block); 4325 block = s_get_cv_croak (block);
4086 4326
4087 if (!*avp) 4327 if (!*avp)
4088 *avp = newAV (); 4328 *avp = newAV ();
4108 4348
4109SV * 4349SV *
4110new (SV *klass, SV *count = 0) 4350new (SV *klass, SV *count = 0)
4111 CODE: 4351 CODE:
4112{ 4352{
4113 int semcnt = 1; 4353 int semcnt = 1;
4114 4354
4115 if (count) 4355 if (count)
4116 { 4356 {
4117 SvGETMAGIC (count); 4357 SvGETMAGIC (count);
4118 4358
4142 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4382 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4143 OUTPUT: 4383 OUTPUT:
4144 RETVAL 4384 RETVAL
4145 4385
4146void 4386void
4147up (SV *self, int adjust = 1) 4387up (SV *self)
4148 ALIAS:
4149 adjust = 1
4150 CODE: 4388 CODE:
4389 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4390
4391void
4392adjust (SV *self, int adjust)
4393 CODE:
4151 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4394 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4152 4395
4153void 4396void
4154down (...) 4397down (...)
4155 CODE: 4398 CODE:
4156 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4399 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4178 XSRETURN_NO; 4421 XSRETURN_NO;
4179} 4422}
4180 4423
4181void 4424void
4182waiters (SV *self) 4425waiters (SV *self)
4183 PPCODE: 4426 PPCODE:
4184{ 4427{
4185 AV *av = (AV *)SvRV (self); 4428 AV *av = (AV *)SvRV (self);
4186 int wcount = AvFILLp (av) + 1 - 1; 4429 int wcount = AvFILLp (av) + 1 - 1;
4187 4430
4188 if (GIMME_V == G_SCALAR) 4431 if (GIMME_V == G_SCALAR)
4200 4443
4201void 4444void
4202_may_delete (SV *sem, int count, unsigned int extra_refs) 4445_may_delete (SV *sem, int count, unsigned int extra_refs)
4203 PPCODE: 4446 PPCODE:
4204{ 4447{
4205 AV *av = (AV *)SvRV (sem); 4448 AV *av = (AV *)SvRV (sem);
4206 4449
4207 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4450 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4208 && AvFILLp (av) == 0 /* no waiters, just count */ 4451 && AvFILLp (av) == 0 /* no waiters, just count */
4209 && SvIV (AvARRAY (av)[0]) == count) 4452 && SvIV (AvARRAY (av)[0]) == count)
4210 XSRETURN_YES; 4453 XSRETURN_YES;
4231 4474
4232void 4475void
4233broadcast (SV *self) 4476broadcast (SV *self)
4234 CODE: 4477 CODE:
4235{ 4478{
4236 AV *av = (AV *)SvRV (self); 4479 AV *av = (AV *)SvRV (self);
4237 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4480 coro_signal_wake (aTHX_ av, AvFILLp (av));
4238} 4481}
4239 4482
4240void 4483void
4241send (SV *self) 4484send (SV *self)
4249 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4492 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4250} 4493}
4251 4494
4252IV 4495IV
4253awaited (SV *self) 4496awaited (SV *self)
4254 CODE: 4497 CODE:
4255 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4498 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4256 OUTPUT: 4499 OUTPUT:
4257 RETVAL 4500 RETVAL
4258 4501
4259 4502
4264 4507
4265void 4508void
4266_schedule (...) 4509_schedule (...)
4267 CODE: 4510 CODE:
4268{ 4511{
4269 static int incede; 4512 static int incede;
4270 4513
4271 api_cede_notself (aTHX); 4514 api_cede_notself (aTHX);
4272 4515
4273 ++incede; 4516 ++incede;
4274 while (coro_nready >= incede && api_cede (aTHX)) 4517 while (coro_nready >= incede && api_cede (aTHX))
4318 { 4561 {
4319 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4562 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4320 coro_old_pp_sselect = 0; 4563 coro_old_pp_sselect = 0;
4321 } 4564 }
4322 4565
4566MODULE = Coro::State PACKAGE = Coro::Util
4567
4568void
4569_exit (int code)
4570 CODE:
4571 _exit (code);
4572
4573NV
4574time ()
4575 CODE:
4576 RETVAL = nvtime (aTHX);
4577 OUTPUT:
4578 RETVAL
4579
4580NV
4581gettimeofday ()
4582 PPCODE:
4583{
4584 UV tv [2];
4585 u2time (aTHX_ tv);
4586 EXTEND (SP, 2);
4587 PUSHs (sv_2mortal (newSVuv (tv [0])));
4588 PUSHs (sv_2mortal (newSVuv (tv [1])));
4589}
4590

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines