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.424 by root, Fri Nov 30 19:27:28 2012 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 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
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
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
28#endif 66#endif
29 67
30#if defined(_WIN32) 68#if defined(_WIN32)
31# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
32# undef setjmp 70# undef setjmp
… …
35# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
36#else 74#else
37# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
38#endif 76#endif
39 77
40#if HAVE_MMAP
41# include <unistd.h>
42# include <sys/mman.h>
43# ifndef MAP_ANONYMOUS
44# ifdef MAP_ANON
45# define MAP_ANONYMOUS MAP_ANON
46# else
47# undef HAVE_MMAP
48# endif
49# endif
50# include <limits.h>
51# ifndef PAGESIZE
52# define PAGESIZE pagesize
53# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
54static long pagesize;
55# else
56# define BOOT_PAGESIZE (void)0
57# endif
58#else
59# define PAGESIZE 0
60# define BOOT_PAGESIZE (void)0
61#endif
62
63#if CORO_USE_VALGRIND
64# include <valgrind/valgrind.h>
65#endif
66
67/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
68static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
69 80
70#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
71# define HAS_SCOPESTACK_NAME 1 82# define HAS_SCOPESTACK_NAME 1
72#endif
73
74#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
75# undef CORO_STACKGUARD
76#endif
77
78#ifndef CORO_STACKGUARD
79# define CORO_STACKGUARD 0
80#endif 83#endif
81 84
82/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
83#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
84# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
137 140
138static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
139static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
140static SV *rv_diehook; 143static SV *rv_diehook;
141static SV *rv_warnhook; 144static SV *rv_warnhook;
142static HV *hv_sig; /* %SIG */
143 145
144/* async_pool helper stuff */ 146/* async_pool helper stuff */
145static SV *sv_pool_rss; 147static SV *sv_pool_rss;
146static SV *sv_pool_size; 148static SV *sv_pool_size;
147static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
175typedef struct coro_cctx 177typedef struct coro_cctx
176{ 178{
177 struct coro_cctx *next; 179 struct coro_cctx *next;
178 180
179 /* the stack */ 181 /* the stack */
180 void *sptr; 182 struct coro_stack stack;
181 size_t ssize;
182 183
183 /* cpu state */ 184 /* cpu state */
184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG 186#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
254 SV *saved_deffh; 255 SV *saved_deffh;
255 SV *invoke_cb; 256 SV *invoke_cb;
256 AV *invoke_av; 257 AV *invoke_av;
257 258
258 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
259 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
260 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
261 262
262 /* swap_sv */ 263 /* swap_sv */
263 AV *swap_sv; 264 AV *swap_sv;
264 265
265 /* times */ 266 /* times */
… …
295#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
296 297
297/** JIT *********************************************************************/ 298/** JIT *********************************************************************/
298 299
299#if CORO_JIT 300#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */ 301 /* APPLE doesn't have mmap though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE 303 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY 304 #if ECB_AMD64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix" 305 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY 306 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix" 307 #define CORO_JIT_TYPE "x86-unix"
307 #endif 308 #endif
308 #endif 309 #endif
309#endif 310#endif
310 311
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
312 #undef CORO_JIT 313 #undef CORO_JIT
313#endif 314#endif
314 315
315#if CORO_JIT 316#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *); 317 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
501 502
502 return 0; 503 return 0;
503} 504}
504 505
505ecb_inline struct coro * 506ecb_inline struct coro *
506SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
507{ 508{
508 MAGIC *mg; 509 MAGIC *mg;
509 510
510 if (SvROK (coro)) 511 if (SvROK (coro_sv))
511 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
512 513
513 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
514 if (!mg) 515 if (!mg)
515 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
516 517
517 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
518} 519}
… …
524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
525 526
526/*****************************************************************************/ 527/*****************************************************************************/
527/* padlist management and caching */ 528/* padlist management and caching */
528 529
529ecb_inline AV * 530ecb_inline PADLIST *
530coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
531{ 532{
532 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
533 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
534 538
535 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
536 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
537#if PERL_VERSION_ATLEAST (5,10,0)
538 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
539#else
540 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
541#endif 568#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
543 --AvFILLp (padlist);
544 569
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
546 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
547 578
548 return newpadlist; 579 return newpadlist;
549} 580}
550 581
551ecb_inline void 582ecb_inline void
552free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
553{ 584{
554 /* may be during global destruction */ 585 /* may be during global destruction */
555 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
556 { 587 {
557 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
558 589
559 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
560 { 591 {
561 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av);
564 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
565 while (j >= 0) 599 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 601
568 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
570 } 605 }
571 606
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
573 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
574 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
576 } 617 }
577} 618}
578 619
579static int 620static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 622{
582 AV *padlist; 623 PADLIST *padlist;
583 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
584 626
585 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
587 return 0; 629 return 0;
588 630
589 /* casting is fun. */ 631 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 633
595 return 0; 634 return 0;
596} 635}
597 636
598static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
604ecb_inline void 643ecb_inline void
605get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
606{ 645{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 647 size_t *lenp;
609 648
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 651 else
613 { 652 {
614#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
626 665
627ecb_inline void 666ecb_inline void
628put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
629{ 668{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 670
633 if (ecb_expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
635 681
636 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
637
638 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
639 av_extend (av, AvFILLp (av) + 1);
640
641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
642} 683}
643 684
644/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
645 686
646ecb_inline void 687ecb_inline void
… …
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668 709
669 /* if SvANY points to the head, we need to adjust the pointers, 710 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa. 711 * as the pointer for a still points to b, and maybe vice versa.
671 */ 712 */
672 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
674 719
675 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677 722
678 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
681#endif 726#endif
682} 727}
683 728
684/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
685static void 730static void
686swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
687{ 732{
688 int i; 733 int i;
689 734
690 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
691 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
692} 737}
693 738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
694#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
695 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
696 swap_svs (aTHX_ (coro)) 750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
697 755
698static void 756static void
699on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
700 758
701static void 759static void
… …
721 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
723 { 781 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 785 }
728 786
729 PUTBACK; 787 PUTBACK;
730 } 788 }
731 789
… …
746 804
747 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
748 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
749 } 807 }
750 808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
751 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
752} 818}
753 819
754static void 820static void
755save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
756{ 822{
757 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
758 832
759 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
760 { 834 {
761 int i; 835 int i;
762 836
… …
889#endif 963#endif
890 964
891 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
892 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
893 PL_savestack_max = 24; 967 PL_savestack_max = 24;
968#if !PERL_VERSION_ATLEAST (5,24,0)
969 /* perl 5.24 moves SS_MAXPUSH optimisation from */
970 /* the header macros to PL_savestack_max */
971 PL_savestack_max -= SS_MAXPUSH;
972#endif
894 973
895#if !PERL_VERSION_ATLEAST (5,10,0) 974#if !PERL_VERSION_ATLEAST (5,10,0)
896 New(54,PL_retstack,4,OP*); 975 New(54,PL_retstack,4,OP*);
897 PL_retstack_ix = 0; 976 PL_retstack_ix = 0;
898 PL_retstack_max = 4; 977 PL_retstack_max = 4;
… …
1115 1194
1116 GvSV (PL_defgv) = newSV (0); 1195 GvSV (PL_defgv) = newSV (0);
1117 GvAV (PL_defgv) = coro->args; coro->args = 0; 1196 GvAV (PL_defgv) = coro->args; coro->args = 0;
1118 GvSV (PL_errgv) = newSV (0); 1197 GvSV (PL_errgv) = newSV (0);
1119 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1198 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1120 GvHV (PL_hintgv) = 0; 1199 GvHV (PL_hintgv) = newHV ();
1200#if PERL_VERSION_ATLEAST (5,10,0)
1201 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1202#endif
1121 PL_rs = newSVsv (GvSV (irsgv)); 1203 PL_rs = newSVsv (GvSV (irsgv));
1122 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1204 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1123 1205
1124 { 1206 {
1125 dSP; 1207 dSP;
… …
1153 PL_op = (OP *)&init_perl_op; 1235 PL_op = (OP *)&init_perl_op;
1154 1236
1155 /* copy throw, in case it was set before init_perl */ 1237 /* copy throw, in case it was set before init_perl */
1156 CORO_THROW = coro->except; 1238 CORO_THROW = coro->except;
1157 1239
1158 SWAP_SVS (coro); 1240 SWAP_SVS_ENTER (coro);
1159 1241
1160 if (ecb_expect_false (enable_times)) 1242 if (ecb_expect_false (enable_times))
1161 { 1243 {
1162 coro_times_update (); 1244 coro_times_update ();
1163 coro_times_sub (coro); 1245 coro_times_sub (coro);
… …
1201 /* this will cause transfer_check to croak on block*/ 1283 /* this will cause transfer_check to croak on block*/
1202 SvRV_set (coro_current, (SV *)coro->hv); 1284 SvRV_set (coro_current, (SV *)coro->hv);
1203 1285
1204 load_perl (aTHX_ coro); 1286 load_perl (aTHX_ coro);
1205 1287
1288 /* restore swapped sv's */
1289 SWAP_SVS_LEAVE (coro);
1290
1206 coro_unwind_stacks (aTHX); 1291 coro_unwind_stacks (aTHX);
1207
1208 /* restore swapped sv's */
1209 SWAP_SVS (coro);
1210 1292
1211 coro_destruct_stacks (aTHX); 1293 coro_destruct_stacks (aTHX);
1212 1294
1213 /* now save some sv's to be free'd later */ 1295 /* now save some sv's to be free'd later */
1214 svf [0] = GvSV (PL_defgv); 1296 svf [0] = GvSV (PL_defgv);
… …
1235 1317
1236 SvREFCNT_dec (coro->saved_deffh); 1318 SvREFCNT_dec (coro->saved_deffh);
1237 SvREFCNT_dec (coro->rouse_cb); 1319 SvREFCNT_dec (coro->rouse_cb);
1238 SvREFCNT_dec (coro->invoke_cb); 1320 SvREFCNT_dec (coro->invoke_cb);
1239 SvREFCNT_dec (coro->invoke_av); 1321 SvREFCNT_dec (coro->invoke_av);
1322 SvREFCNT_dec (coro->on_enter_xs);
1323 SvREFCNT_dec (coro->on_leave_xs);
1240 } 1324 }
1241} 1325}
1242 1326
1243ecb_inline void 1327ecb_inline void
1244free_coro_mortal (pTHX) 1328free_coro_mortal (pTHX)
… …
1307 1391
1308 if (PL_curcop != &PL_compiling) 1392 if (PL_curcop != &PL_compiling)
1309 { 1393 {
1310 SV **cb; 1394 SV **cb;
1311 1395
1312 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1396 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1313 { 1397 {
1314 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1398 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1315 1399
1316 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1400 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1317 { 1401 {
… …
1459 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1543 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1460 * runtime errors here, as this is just a random interpreter, not a thread. 1544 * runtime errors here, as this is just a random interpreter, not a thread.
1461 */ 1545 */
1462 1546
1463 /* 1547 /*
1548 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1549 * requires PL_scopestack_ix, so do it here if required.
1550 */
1551 if (!PL_scopestack_ix)
1552 ENTER;
1553
1554 /*
1464 * If perl-run returns we assume exit() was being called or the coro 1555 * If perl-run returns we assume exit() was being called or the coro
1465 * fell off the end, which seems to be the only valid (non-bug) 1556 * fell off the end, which seems to be the only valid (non-bug)
1466 * reason for perl_run to return. We try to mimic whatever perl is normally 1557 * reason for perl_run to return. We try to mimic whatever perl is normally
1467 * doing in that case. YMMV. 1558 * doing in that case. YMMV.
1468 */ 1559 */
… …
1489static coro_cctx * 1580static coro_cctx *
1490cctx_new_empty (void) 1581cctx_new_empty (void)
1491{ 1582{
1492 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1493 1584
1494 cctx->sptr = 0; 1585 cctx->stack.sptr = 0;
1495 coro_create (&cctx->cctx, 0, 0, 0, 0); 1586 coro_create (&cctx->cctx, 0, 0, 0, 0);
1496 1587
1497 return cctx; 1588 return cctx;
1498} 1589}
1499 1590
1500/* create a new cctx suitable as destination/running a perl interpreter */ 1591/* create a new cctx suitable as destination/running a perl interpreter */
1501static coro_cctx * 1592static coro_cctx *
1502cctx_new_run (void) 1593cctx_new_run (void)
1503{ 1594{
1504 coro_cctx *cctx = cctx_new (); 1595 coro_cctx *cctx = cctx_new ();
1505 void *stack_start;
1506 size_t stack_size;
1507 1596
1508#if HAVE_MMAP 1597 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1509 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1510 /* mmap supposedly does allocate-on-write for us */
1511 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1512
1513 if (cctx->sptr != (void *)-1)
1514 {
1515 #if CORO_STACKGUARD
1516 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1517 #endif
1518 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1519 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1520 cctx->flags |= CC_MAPPED;
1521 } 1598 {
1522 else
1523#endif
1524 {
1525 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1526 New (0, cctx->sptr, cctx_stacksize, long);
1527
1528 if (!cctx->sptr)
1529 {
1530 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1599 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1531 _exit (EXIT_FAILURE); 1600 _exit (EXIT_FAILURE);
1532 }
1533
1534 stack_start = cctx->sptr;
1535 stack_size = cctx->ssize;
1536 } 1601 }
1537 1602
1538 #if CORO_USE_VALGRIND
1539 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1540 #endif
1541
1542 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1603 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1543 1604
1544 return cctx; 1605 return cctx;
1545} 1606}
1546 1607
1547static void 1608static void
… …
1553 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1614 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1554 1615
1555 --cctx_count; 1616 --cctx_count;
1556 coro_destroy (&cctx->cctx); 1617 coro_destroy (&cctx->cctx);
1557 1618
1558 /* coro_transfer creates new, empty cctx's */ 1619 coro_stack_free (&cctx->stack);
1559 if (cctx->sptr)
1560 {
1561 #if CORO_USE_VALGRIND
1562 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1563 #endif
1564
1565#if HAVE_MMAP
1566 if (cctx->flags & CC_MAPPED)
1567 munmap (cctx->sptr, cctx->ssize);
1568 else
1569#endif
1570 Safefree (cctx->sptr);
1571 }
1572 1620
1573 Safefree (cctx); 1621 Safefree (cctx);
1574} 1622}
1575 1623
1576/* wether this cctx should be destructed */ 1624/* wether this cctx should be destructed */
… …
1595} 1643}
1596 1644
1597static void 1645static void
1598cctx_put (coro_cctx *cctx) 1646cctx_put (coro_cctx *cctx)
1599{ 1647{
1600 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1648 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1601 1649
1602 /* free another cctx if overlimit */ 1650 /* free another cctx if overlimit */
1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1651 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1604 { 1652 {
1605 coro_cctx *first = cctx_first; 1653 coro_cctx *first = cctx_first;
… …
1937 /* nothing to schedule: call the idle handler */ 1985 /* nothing to schedule: call the idle handler */
1938 if (SvROK (sv_idle) 1986 if (SvROK (sv_idle)
1939 && SvOBJECT (SvRV (sv_idle))) 1987 && SvOBJECT (SvRV (sv_idle)))
1940 { 1988 {
1941 if (SvRV (sv_idle) == SvRV (coro_current)) 1989 if (SvRV (sv_idle) == SvRV (coro_current))
1990 {
1991 require_pv ("Carp");
1992
1993 {
1994 dSP;
1995
1996 ENTER;
1997 SAVETMPS;
1998
1999 PUSHMARK (SP);
1942 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2000 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2001 PUTBACK;
2002 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2003
2004 FREETMPS;
2005 LEAVE;
2006 }
2007 }
1943 2008
1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2009 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1945 api_ready (aTHX_ SvRV (sv_idle)); 2010 api_ready (aTHX_ SvRV (sv_idle));
1946 --coro_nready; 2011 --coro_nready;
1947 } 2012 }
… …
2145 AV *od = coro->on_destroy; 2210 AV *od = coro->on_destroy;
2146 2211
2147 if (!od) 2212 if (!od)
2148 return; 2213 return;
2149 2214
2215 coro->on_destroy = 0;
2216 sv_2mortal ((SV *)od);
2217
2150 while (AvFILLp (od) >= 0) 2218 while (AvFILLp (od) >= 0)
2151 { 2219 {
2152 SV *cb = sv_2mortal (av_pop (od)); 2220 SV *cb = sv_2mortal (av_pop (od));
2153 2221
2154 /* coro hv's (and only hv's at the moment) are supported as well */ 2222 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2316 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 } 2317 }
2250 else 2318 else
2251 { 2319 {
2252 struct coro *self = SvSTATE_current; 2320 struct coro *self = SvSTATE_current;
2321
2322 if (!self)
2323 croak ("Coro::cancel called outside of thread content,");
2253 2324
2254 /* otherwise we cancel directly, purely for speed reasons 2325 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as 2326 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation. 2327 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed. 2328 * this is ugly, and hopefully fully worth the extra speed.
… …
2367 else 2438 else
2368 { 2439 {
2369 av_clear (GvAV (PL_defgv)); 2440 av_clear (GvAV (PL_defgv));
2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2441 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2371 2442
2443 if (ecb_expect_false (coro->swap_sv))
2444 {
2445 swap_svs_leave (coro);
2446 SvREFCNT_dec_NN (coro->swap_sv);
2447 coro->swap_sv = 0;
2448 }
2449
2372 coro->prio = 0; 2450 coro->prio = 0;
2373 2451
2374 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2452 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2375 api_trace (aTHX_ coro_current, 0); 2453 api_trace (aTHX_ coro_current, 0);
2376 2454
2377 frame->prepare = prepare_schedule; 2455 frame->prepare = prepare_schedule;
2378 av_push (av_async_pool, SvREFCNT_inc (hv)); 2456 av_push (av_async_pool, SvREFCNT_inc (hv));
2379 } 2457 }
… …
2599 2677
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2678/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void 2679static void
2602slf_destroy (pTHX_ struct coro *coro) 2680slf_destroy (pTHX_ struct coro *coro)
2603{ 2681{
2604 /* this callback is reserved for slf functions needing to do cleanup */ 2682 struct CoroSLF frame = coro->slf_frame;
2605 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2606 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2607 2683
2608 /* 2684 /*
2609 * The on_destroy above most likely is from an SLF call. 2685 * The on_destroy below most likely is from an SLF call.
2610 * Since by definition the SLF call will not finish when we destroy 2686 * Since by definition the SLF call will not finish when we destroy
2611 * the coro, we will have to force-finish it here, otherwise 2687 * the coro, we will have to force-finish it here, otherwise
2612 * cleanup functions cannot call SLF functions. 2688 * cleanup functions cannot call SLF functions.
2613 */ 2689 */
2614 coro->slf_frame.prepare = 0; 2690 coro->slf_frame.prepare = 0;
2691
2692 /* this callback is reserved for slf functions needing to do cleanup */
2693 if (frame.destroy && frame.prepare && !PL_dirty)
2694 frame.destroy (aTHX_ &frame);
2615} 2695}
2616 2696
2617/* 2697/*
2618 * these not obviously related functions are all rolled into one 2698 * these not obviously related functions are all rolled into one
2619 * function to increase chances that they all will call transfer with the same 2699 * function to increase chances that they all will call transfer with the same
… …
2802static void 2882static void
2803coro_pop_on_leave (pTHX_ void *coro) 2883coro_pop_on_leave (pTHX_ void *coro)
2804{ 2884{
2805 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2885 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2806 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2886 on_enterleave_call (aTHX_ sv_2mortal (cb));
2887}
2888
2889static void
2890enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2891{
2892 if (!hook)
2893 return;
2894
2895 if (!*avp)
2896 {
2897 *avp = newAV ();
2898 AvREAL_off (*avp);
2899 }
2900
2901 av_push (*avp, (SV *)hook);
2902 av_push (*avp, (SV *)arg);
2903}
2904
2905static void
2906enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2907{
2908 AV *av = *avp;
2909 int i;
2910
2911 if (!av)
2912 return;
2913
2914 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2915 if (AvARRAY (av)[i] == (SV *)hook)
2916 {
2917 if (execute)
2918 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2919
2920 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2921 av_pop (av);
2922 av_pop (av);
2923 break;
2924 }
2925
2926 if (AvFILLp (av) >= 0)
2927 {
2928 *avp = 0;
2929 SvREFCNT_dec_NN (av);
2930 }
2931}
2932
2933static void
2934api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 if (SvSTATE_current == coro)
2939 if (enter)
2940 enter (aTHX_ enter_arg);
2941
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2943 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2944}
2945
2946static void
2947api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2948{
2949 struct coro *coro = SvSTATE (coro_sv);
2950
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2952 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2953}
2954
2955static void
2956savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2957{
2958 struct coro *coro = SvSTATE_current;
2959
2960 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2961}
2962
2963static void
2964savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2965{
2966 struct coro *coro = SvSTATE_current;
2967
2968 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2969}
2970
2971static void
2972api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2975
2976 /* this ought to be much cheaper than malloc + a single destructor call */
2977 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2978 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2807} 2979}
2808 2980
2809/*****************************************************************************/ 2981/*****************************************************************************/
2810/* PerlIO::cede */ 2982/* PerlIO::cede */
2811 2983
… …
2941 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3113 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2942 PUTBACK; 3114 PUTBACK;
2943 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3115 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2944 } 3116 }
2945 3117
2946 SvREFCNT_dec (cb); 3118 SvREFCNT_dec_NN (cb);
2947 } 3119 }
2948} 3120}
2949 3121
2950static void 3122static void
2951coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3123coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2959{ 3131{
2960 AV *av = (AV *)frame->data; 3132 AV *av = (AV *)frame->data;
2961 SV *count_sv = AvARRAY (av)[0]; 3133 SV *count_sv = AvARRAY (av)[0];
2962 SV *coro_hv = SvRV (coro_current); 3134 SV *coro_hv = SvRV (coro_current);
2963 3135
3136 frame->destroy = 0;
3137
2964 /* if we are about to throw, don't actually acquire the lock, just throw */ 3138 /* if we are about to throw, don't actually acquire the lock, just throw */
2965 if (CORO_THROW) 3139 if (ecb_expect_false (CORO_THROW))
3140 {
3141 /* we still might be responsible for the semaphore, so wake up others */
3142 coro_semaphore_adjust (aTHX_ av, 0);
3143
2966 return 0; 3144 return 0;
3145 }
2967 else if (SvIVX (count_sv) > 0) 3146 else if (SvIVX (count_sv) > 0)
2968 { 3147 {
2969 frame->destroy = 0;
2970
2971 if (acquire) 3148 if (acquire)
2972 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3149 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2973 else 3150 else
2974 coro_semaphore_adjust (aTHX_ av, 0); 3151 coro_semaphore_adjust (aTHX_ av, 0);
2975 3152
… …
3086 { 3263 {
3087 api_ready (aTHX_ cb); 3264 api_ready (aTHX_ cb);
3088 sv_setiv (cb, 0); /* signal waiter */ 3265 sv_setiv (cb, 0); /* signal waiter */
3089 } 3266 }
3090 3267
3091 SvREFCNT_dec (cb); 3268 SvREFCNT_dec_NN (cb);
3092 3269
3093 --count; 3270 --count;
3094 } 3271 }
3095} 3272}
3096 3273
… …
3181 } 3358 }
3182 3359
3183 av_push (state, data_sv); 3360 av_push (state, data_sv);
3184 3361
3185 api_ready (aTHX_ coro); 3362 api_ready (aTHX_ coro);
3186 SvREFCNT_dec (coro); 3363 SvREFCNT_dec_NN (coro);
3187 SvREFCNT_dec ((AV *)state); 3364 SvREFCNT_dec_NN ((AV *)state);
3188} 3365}
3189 3366
3190static int 3367static int
3191slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3368slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3192{ 3369{
… …
3197 /* it quickly returns */ 3374 /* it quickly returns */
3198 if (CORO_THROW) 3375 if (CORO_THROW)
3199 return 0; 3376 return 0;
3200 3377
3201 /* one element that is an RV? repeat! */ 3378 /* one element that is an RV? repeat! */
3202 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3379 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3203 return 1; 3380 return 1;
3204 3381
3205 /* restore status */ 3382 /* restore status */
3206 { 3383 {
3207 SV *data_sv = av_pop (state); 3384 SV *data_sv = av_pop (state);
… …
3210 errno = data->errorno; 3387 errno = data->errorno;
3211 PL_laststype = data->laststype; 3388 PL_laststype = data->laststype;
3212 PL_laststatval = data->laststatval; 3389 PL_laststatval = data->laststatval;
3213 PL_statcache = data->statcache; 3390 PL_statcache = data->statcache;
3214 3391
3215 SvREFCNT_dec (data_sv); 3392 SvREFCNT_dec_NN (data_sv);
3216 } 3393 }
3217 3394
3218 /* push result values */ 3395 /* push result values */
3219 { 3396 {
3220 dSP; 3397 dSP;
… …
3435 3612
3436PROTOTYPES: DISABLE 3613PROTOTYPES: DISABLE
3437 3614
3438BOOT: 3615BOOT:
3439{ 3616{
3617#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3618#include "state.h"
3440#ifdef USE_ITHREADS 3619#ifdef USE_ITHREADS
3441# if CORO_PTHREAD 3620# if CORO_PTHREAD
3442 coro_thx = PERL_GET_CONTEXT; 3621 coro_thx = PERL_GET_CONTEXT;
3443# endif 3622# endif
3444#endif 3623#endif
3445 BOOT_PAGESIZE;
3446
3447 /* perl defines these to check for existance first, but why it doesn't */ 3624 /* perl defines these to check for existance first, but why it doesn't */
3448 /* just create them one at init time is not clear to me, except for */ 3625 /* just create them one at init time is not clear to me, except for */
3449 /* programs trying to delete them, but... */ 3626 /* programs trying to delete them, but... */
3450 /* anyway, we declare this as invalid and make sure they are initialised here */ 3627 /* anyway, we declare this as invalid and make sure they are initialised here */
3451 DEFSV; 3628 DEFSV;
… …
3458 3635
3459 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3636 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3460 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3637 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3461 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3638 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3462 3639
3463 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3464 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3640 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3465 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3641 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3466 3642
3467 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3643 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3468 3644
… …
3521void 3697void
3522transfer (...) 3698transfer (...)
3523 PROTOTYPE: $$ 3699 PROTOTYPE: $$
3524 CODE: 3700 CODE:
3525 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3701 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3526
3527void
3528_exit (int code)
3529 PROTOTYPE: $
3530 CODE:
3531 _exit (code);
3532 3702
3533SV * 3703SV *
3534clone (Coro::State coro) 3704clone (Coro::State coro)
3535 CODE: 3705 CODE:
3536{ 3706{
… …
3591void 3761void
3592list () 3762list ()
3593 PROTOTYPE: 3763 PROTOTYPE:
3594 PPCODE: 3764 PPCODE:
3595{ 3765{
3596 struct coro *coro; 3766 struct coro *coro;
3597 for (coro = coro_first; coro; coro = coro->next) 3767 for (coro = coro_first; coro; coro = coro->next)
3598 if (coro->hv) 3768 if (coro->hv)
3599 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3769 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3600} 3770}
3601 3771
… …
3763 3933
3764void 3934void
3765times (Coro::State self) 3935times (Coro::State self)
3766 PPCODE: 3936 PPCODE:
3767{ 3937{
3768 struct coro *current = SvSTATE (coro_current); 3938 struct coro *current = SvSTATE (coro_current);
3769 3939
3770 if (ecb_expect_false (current == self)) 3940 if (ecb_expect_false (current == self))
3771 { 3941 {
3772 coro_times_update (); 3942 coro_times_update ();
3773 coro_times_add (SvSTATE (coro_current)); 3943 coro_times_add (SvSTATE (coro_current));
… …
3780 if (ecb_expect_false (current == self)) 3950 if (ecb_expect_false (current == self))
3781 coro_times_sub (SvSTATE (coro_current)); 3951 coro_times_sub (SvSTATE (coro_current));
3782} 3952}
3783 3953
3784void 3954void
3785swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3955swap_sv (Coro::State coro, SV *sva, SV *svb)
3786 CODE: 3956 CODE:
3787{ 3957{
3788 struct coro *current = SvSTATE_current; 3958 struct coro *current = SvSTATE_current;
3959 AV *swap_sv;
3960 int i;
3961
3962 sva = SvRV (sva);
3963 svb = SvRV (svb);
3789 3964
3790 if (current == coro) 3965 if (current == coro)
3791 SWAP_SVS (current); 3966 SWAP_SVS_LEAVE (current);
3792 3967
3793 if (!coro->swap_sv) 3968 if (!coro->swap_sv)
3794 coro->swap_sv = newAV (); 3969 coro->swap_sv = newAV ();
3795 3970
3971 swap_sv = coro->swap_sv;
3972
3973 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3974 {
3975 SV *a = AvARRAY (swap_sv)[i ];
3976 SV *b = AvARRAY (swap_sv)[i + 1];
3977
3978 if (a == sva && b == svb)
3979 {
3980 SvREFCNT_dec_NN (a);
3981 SvREFCNT_dec_NN (b);
3982
3983 for (; i <= AvFILLp (swap_sv) - 2; i++)
3984 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3985
3986 AvFILLp (swap_sv) -= 2;
3987
3988 goto removed;
3989 }
3990 }
3991
3796 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3992 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3797 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3993 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3994
3995 removed:
3798 3996
3799 if (current == coro) 3997 if (current == coro)
3800 SWAP_SVS (current); 3998 SWAP_SVS_ENTER (current);
3801} 3999}
3802 4000
3803 4001
3804MODULE = Coro::State PACKAGE = Coro 4002MODULE = Coro::State PACKAGE = Coro
3805 4003
3806BOOT: 4004BOOT:
3807{ 4005{
4006 if (SVt_LAST > 32)
4007 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4008
3808 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4009 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3809 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4010 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3810 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4011 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3811 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4012 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3812 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4013 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3838 coroapi.ready = api_ready; 4039 coroapi.ready = api_ready;
3839 coroapi.is_ready = api_is_ready; 4040 coroapi.is_ready = api_is_ready;
3840 coroapi.nready = coro_nready; 4041 coroapi.nready = coro_nready;
3841 coroapi.current = coro_current; 4042 coroapi.current = coro_current;
3842 4043
4044 coroapi.enterleave_hook = api_enterleave_hook;
4045 coroapi.enterleave_unhook = api_enterleave_unhook;
4046 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4047
3843 /*GCoroAPI = &coroapi;*/ 4048 /*GCoroAPI = &coroapi;*/
3844 sv_setiv (sv, (IV)&coroapi); 4049 sv_setiv (sv, (IV)&coroapi);
3845 SvREADONLY_on (sv); 4050 SvREADONLY_on (sv);
3846 } 4051 }
3847} 4052}
… …
3912 4117
3913void 4118void
3914_set_current (SV *current) 4119_set_current (SV *current)
3915 PROTOTYPE: $ 4120 PROTOTYPE: $
3916 CODE: 4121 CODE:
3917 SvREFCNT_dec (SvRV (coro_current)); 4122 SvREFCNT_dec_NN (SvRV (coro_current));
3918 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4123 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3919 4124
3920void 4125void
3921_set_readyhook (SV *hook) 4126_set_readyhook (SV *hook)
3922 PROTOTYPE: $ 4127 PROTOTYPE: $
… …
4006 4211
4007 if ((SV *)hv == &PL_sv_undef) 4212 if ((SV *)hv == &PL_sv_undef)
4008 { 4213 {
4009 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4214 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4010 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4215 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4011 SvREFCNT_dec (sv); 4216 SvREFCNT_dec_NN (sv);
4012 } 4217 }
4013 4218
4014 { 4219 {
4015 struct coro *coro = SvSTATE_hv (hv); 4220 struct coro *coro = SvSTATE_hv (hv);
4016 4221
… …
4023 api_ready (aTHX_ (SV *)hv); 4228 api_ready (aTHX_ (SV *)hv);
4024 4229
4025 if (GIMME_V != G_VOID) 4230 if (GIMME_V != G_VOID)
4026 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4231 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4027 else 4232 else
4028 SvREFCNT_dec (hv); 4233 SvREFCNT_dec_NN (hv);
4029} 4234}
4030 4235
4031SV * 4236SV *
4032rouse_cb () 4237rouse_cb ()
4033 PROTOTYPE: 4238 PROTOTYPE:
… …
4048 on_leave = 1 4253 on_leave = 1
4049 PROTOTYPE: & 4254 PROTOTYPE: &
4050 CODE: 4255 CODE:
4051{ 4256{
4052 struct coro *coro = SvSTATE_current; 4257 struct coro *coro = SvSTATE_current;
4053 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4258 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4054 4259
4055 block = s_get_cv_croak (block); 4260 block = s_get_cv_croak (block);
4056 4261
4057 if (!*avp) 4262 if (!*avp)
4058 *avp = newAV (); 4263 *avp = newAV ();
… …
4078 4283
4079SV * 4284SV *
4080new (SV *klass, SV *count = 0) 4285new (SV *klass, SV *count = 0)
4081 CODE: 4286 CODE:
4082{ 4287{
4083 int semcnt = 1; 4288 int semcnt = 1;
4084 4289
4085 if (count) 4290 if (count)
4086 { 4291 {
4087 SvGETMAGIC (count); 4292 SvGETMAGIC (count);
4088 4293
… …
4112 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4317 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4113 OUTPUT: 4318 OUTPUT:
4114 RETVAL 4319 RETVAL
4115 4320
4116void 4321void
4117up (SV *self, int adjust = 1) 4322up (SV *self)
4118 ALIAS:
4119 adjust = 1
4120 CODE: 4323 CODE:
4324 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4325
4326void
4327adjust (SV *self, int adjust)
4328 CODE:
4121 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4329 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4122 4330
4123void 4331void
4124down (...) 4332down (...)
4125 CODE: 4333 CODE:
4126 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4334 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
4148 XSRETURN_NO; 4356 XSRETURN_NO;
4149} 4357}
4150 4358
4151void 4359void
4152waiters (SV *self) 4360waiters (SV *self)
4153 PPCODE: 4361 PPCODE:
4154{ 4362{
4155 AV *av = (AV *)SvRV (self); 4363 AV *av = (AV *)SvRV (self);
4156 int wcount = AvFILLp (av) + 1 - 1; 4364 int wcount = AvFILLp (av) + 1 - 1;
4157 4365
4158 if (GIMME_V == G_SCALAR) 4366 if (GIMME_V == G_SCALAR)
… …
4170 4378
4171void 4379void
4172_may_delete (SV *sem, int count, unsigned int extra_refs) 4380_may_delete (SV *sem, int count, unsigned int extra_refs)
4173 PPCODE: 4381 PPCODE:
4174{ 4382{
4175 AV *av = (AV *)SvRV (sem); 4383 AV *av = (AV *)SvRV (sem);
4176 4384
4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4385 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4178 && AvFILLp (av) == 0 /* no waiters, just count */ 4386 && AvFILLp (av) == 0 /* no waiters, just count */
4179 && SvIV (AvARRAY (av)[0]) == count) 4387 && SvIV (AvARRAY (av)[0]) == count)
4180 XSRETURN_YES; 4388 XSRETURN_YES;
… …
4201 4409
4202void 4410void
4203broadcast (SV *self) 4411broadcast (SV *self)
4204 CODE: 4412 CODE:
4205{ 4413{
4206 AV *av = (AV *)SvRV (self); 4414 AV *av = (AV *)SvRV (self);
4207 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4415 coro_signal_wake (aTHX_ av, AvFILLp (av));
4208} 4416}
4209 4417
4210void 4418void
4211send (SV *self) 4419send (SV *self)
… …
4219 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4427 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4220} 4428}
4221 4429
4222IV 4430IV
4223awaited (SV *self) 4431awaited (SV *self)
4224 CODE: 4432 CODE:
4225 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4433 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4226 OUTPUT: 4434 OUTPUT:
4227 RETVAL 4435 RETVAL
4228 4436
4229 4437
… …
4234 4442
4235void 4443void
4236_schedule (...) 4444_schedule (...)
4237 CODE: 4445 CODE:
4238{ 4446{
4239 static int incede; 4447 static int incede;
4240 4448
4241 api_cede_notself (aTHX); 4449 api_cede_notself (aTHX);
4242 4450
4243 ++incede; 4451 ++incede;
4244 while (coro_nready >= incede && api_cede (aTHX)) 4452 while (coro_nready >= incede && api_cede (aTHX))
… …
4288 { 4496 {
4289 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4497 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4290 coro_old_pp_sselect = 0; 4498 coro_old_pp_sselect = 0;
4291 } 4499 }
4292 4500
4501MODULE = Coro::State PACKAGE = Coro::Util
4502
4503void
4504_exit (int code)
4505 CODE:
4506 _exit (code);
4507
4508NV
4509time ()
4510 CODE:
4511 RETVAL = nvtime (aTHX);
4512 OUTPUT:
4513 RETVAL
4514
4515NV
4516gettimeofday ()
4517 PPCODE:
4518{
4519 UV tv [2];
4520 u2time (aTHX_ tv);
4521 EXTEND (SP, 2);
4522 PUSHs (sv_2mortal (newSVuv (tv [0])));
4523 PUSHs (sv_2mortal (newSVuv (tv [1])));
4524}
4525

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines