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.415 by root, Tue Aug 30 07:48:53 2011 UTC vs.
Revision 1.446 by root, Wed Sep 3 14:26:34 2014 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
… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
17#include "ecb.h" 20#include "ecb.h"
18 21
19#include <stddef.h> 22#include <stddef.h>
20#include <stdio.h> 23#include <stdio.h>
21#include <errno.h> 24#include <errno.h>
22#include <assert.h> 25#include <assert.h>
23 26
24#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
26#endif 52#endif
27 53
28#if defined(_WIN32) 54#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 55# undef HAS_GETTIMEOFDAY
30# undef setjmp 56# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
34#else 60#else
35# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
36#endif 62#endif
37 63
38#if HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
67 66
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 68# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
73# undef CORO_STACKGUARD
74#endif
75
76#ifndef CORO_STACKGUARD
77# define CORO_STACKGUARD 0
78#endif 69#endif
79 70
80/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
101# if CORO_PTHREAD 92# if CORO_PTHREAD
102static void *coro_thx; 93static void *coro_thx;
103# endif 94# endif
104#endif 95#endif
105 96
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux 97#ifdef __linux
110# include <time.h> /* for timespec */ 98# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */ 99# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime 100# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 101# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
176typedef struct coro_cctx 164typedef struct coro_cctx
177{ 165{
178 struct coro_cctx *next; 166 struct coro_cctx *next;
179 167
180 /* the stack */ 168 /* the stack */
181 void *sptr; 169 struct coro_stack stack;
182 size_t ssize;
183 170
184 /* cpu state */ 171 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
187 JMPENV *top_env; 176 JMPENV *top_env;
188 coro_context cctx; 177 coro_context cctx;
189 178
190 U32 gen; 179 U32 gen;
191#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
… …
211}; 200};
212 201
213/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
214typedef struct 203typedef struct
215{ 204{
216#define VARx(name,expr,type) type name; 205 #define VARx(name,expr,type) type name;
217# include "state.h" 206 #include "state.h"
218#undef VARx
219} perl_slots; 207} perl_slots;
220 208
221/* how many context stack entries do we need for perl_slots */ 209/* how many context stack entries do we need for perl_slots */
222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 211
… …
295#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
296 284
297/** JIT *********************************************************************/ 285/** JIT *********************************************************************/
298 286
299#if CORO_JIT 287#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */ 288 /* APPLE doesn't have mmap though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE 290 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY 291 #if ECB_AMD64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix" 292 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY 293 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix" 294 #define CORO_JIT_TYPE "x86-unix"
307 #endif 295 #endif
308 #endif 296 #endif
309#endif 297#endif
310 298
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
312 #undef CORO_JIT 300 #undef CORO_JIT
313#endif 301#endif
314 302
315#if CORO_JIT 303#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *); 304 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
373time_init (pTHX) 361time_init (pTHX)
374{ 362{
375 SV **svp; 363 SV **svp;
376 364
377 require_pv ("Time/HiRes.pm"); 365 require_pv ("Time/HiRes.pm");
378 366
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380 368
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383 371
… …
524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
525 513
526/*****************************************************************************/ 514/*****************************************************************************/
527/* padlist management and caching */ 515/* padlist management and caching */
528 516
529ecb_inline AV * 517ecb_inline PADLIST *
530coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
531{ 519{
532 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
533 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
534 524
535 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
536 AvREAL_off (newpadlist); 553 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 554#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
543 --AvFILLp (padlist);
544 555
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
546 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
547 560
548 return newpadlist; 561 return newpadlist;
549} 562}
550 563
551ecb_inline void 564ecb_inline void
552free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
553{ 566{
554 /* may be during global destruction */ 567 /* may be during global destruction */
555 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
556 { 569 {
557 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
558 571
559 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
560 { 573 {
561 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av);
564 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
565 while (j >= 0) 581 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 583
568 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
570 } 587 }
571 588
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
573 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
574 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
576 } 599 }
577} 600}
578 601
579static int 602static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 604{
582 AV *padlist; 605 PADLIST *padlist;
583 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
584 608
585 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
587 return 0; 611 return 0;
588 612
589 /* casting is fun. */ 613 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 615
595 return 0; 616 return 0;
596} 617}
597 618
598static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
604ecb_inline void 625ecb_inline void
605get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
606{ 627{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 629 size_t *lenp;
609 630
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 633 else
613 { 634 {
614#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
626 647
627ecb_inline void 648ecb_inline void
628put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
629{ 650{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 652
633 if (ecb_expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
635 663
636 av = (AV *)mg->mg_obj; 664 ((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} 665}
643 666
644/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
645 668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
646/* swap sv heads, at least logically */ 707/* swap sv heads, at least logically */
647static void 708static void
648swap_svs (pTHX_ Coro__State c) 709swap_svs (pTHX_ Coro__State c)
649{ 710{
650 int i; 711 int i;
651 712
652 for (i = 0; i <= AvFILLp (c->swap_sv); ) 713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
653 { 714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
654 SV *a = AvARRAY (c->swap_sv)[i++];
655 SV *b = AvARRAY (c->swap_sv)[i++];
656
657 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
658 SV tmp;
659
660 /* swap sv_any */
661 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
662
663 /* swap sv_flags */
664 SvFLAGS (&tmp) = SvFLAGS (a);
665 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
666 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
667
668#if PERL_VERSION_ATLEAST (5,10,0)
669 /* perl 5.10 complicates this _quite_ a bit, but it also is
670 * much faster, so no quarrels here. alternatively, we could
671 * sv_upgrade to avoid this.
672 */
673 {
674 /* swap sv_u */
675 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
676
677 /* if SvANY points to the head, we need to adjust the pointers,
678 * as the pointer for a still points to b, and maybe vice versa.
679 */
680 #define svany_in_head(type) \
681 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
682
683 if (svany_in_head (SvTYPE (a)))
684 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
685
686 if (svany_in_head (SvTYPE (b)))
687 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
688 }
689#endif
690 }
691} 715}
692 716
693#define SWAP_SVS(coro) \ 717#define SWAP_SVS(coro) \
694 if (ecb_expect_false ((coro)->swap_sv)) \ 718 if (ecb_expect_false ((coro)->swap_sv)) \
695 swap_svs (aTHX_ (coro)) 719 swap_svs (aTHX_ (coro))
… …
707 731
708#if CORO_JIT 732#if CORO_JIT
709 load_perl_slots (slot); 733 load_perl_slots (slot);
710#else 734#else
711 #define VARx(name,expr,type) expr = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
712 # include "state.h" 736 #include "state.h"
713 #undef VARx
714#endif 737#endif
715 738
716 { 739 {
717 dSP; 740 dSP;
718 741
… …
721 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
723 { 746 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 750 }
728 751
729 PUTBACK; 752 PUTBACK;
730 } 753 }
731 754
… …
840 863
841#if CORO_JIT 864#if CORO_JIT
842 save_perl_slots (slot); 865 save_perl_slots (slot);
843#else 866#else
844 #define VARx(name,expr,type) slot->name = expr; 867 #define VARx(name,expr,type) slot->name = expr;
845 # include "state.h" 868 #include "state.h"
846 #undef VARx
847#endif 869#endif
848 } 870 }
849} 871}
850 872
851/* 873/*
… …
995 { 1017 {
996 SV **svp = 0; 1018 SV **svp = 0;
997 1019
998 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
999 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1000 1022
1001 if (svp) 1023 if (svp)
1002 { 1024 {
1003 SV *ssv; 1025 SV *ssv;
1004 1026
1005 if (!*svp) 1027 if (!*svp)
… …
1111 PL_hints = 0; 1133 PL_hints = 0;
1112 1134
1113 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1114 PL_diehook = SvREFCNT_inc (rv_diehook); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1115 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1116 1138
1117 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1118 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1119 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1120 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1121 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = newHV ();
1144#if PERL_VERSION_ATLEAST (5,10,0)
1145 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1146#endif
1122 PL_rs = newSVsv (GvSV (irsgv)); 1147 PL_rs = newSVsv (GvSV (irsgv));
1123 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1148 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1124 1149
1125 { 1150 {
1126 dSP; 1151 dSP;
… …
1414transfer_tail (pTHX) 1439transfer_tail (pTHX)
1415{ 1440{
1416 free_coro_mortal (aTHX); 1441 free_coro_mortal (aTHX);
1417} 1442}
1418 1443
1444/* try to exit the same way perl's main function would do */
1445/* we do not bother resetting the environment or other things *7
1446/* that are not, uhm, essential */
1447/* this obviously also doesn't work when perl is embedded */
1448static void ecb_noinline ecb_cold
1449perlish_exit (pTHX)
1450{
1451 int exitstatus = perl_destruct (PL_curinterp);
1452 perl_free (PL_curinterp);
1453 exit (exitstatus);
1454}
1455
1419/* 1456/*
1420 * this is a _very_ stripped down perl interpreter ;) 1457 * this is a _very_ stripped down perl interpreter ;)
1421 */ 1458 */
1422static void 1459static void
1423cctx_run (void *arg) 1460cctx_run (void *arg)
… …
1450 */ 1487 */
1451 1488
1452 /* 1489 /*
1453 * If perl-run returns we assume exit() was being called or the coro 1490 * If perl-run returns we assume exit() was being called or the coro
1454 * fell off the end, which seems to be the only valid (non-bug) 1491 * fell off the end, which seems to be the only valid (non-bug)
1455 * reason for perl_run to return. We try to exit by jumping to the 1492 * reason for perl_run to return. We try to mimic whatever perl is normally
1456 * bootstrap-time "top" top_env, as we cannot restore the "main" 1493 * doing in that case. YMMV.
1457 * coroutine as Coro has no such concept.
1458 * This actually isn't valid with the pthread backend, but OSes requiring
1459 * that backend are too broken to do it in a standards-compliant way.
1460 */ 1494 */
1461 PL_top_env = main_top_env; 1495 perlish_exit (aTHX);
1462 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1463 } 1496 }
1464} 1497}
1465 1498
1466static coro_cctx * 1499static coro_cctx *
1467cctx_new (void) 1500cctx_new (void)
… …
1482static coro_cctx * 1515static coro_cctx *
1483cctx_new_empty (void) 1516cctx_new_empty (void)
1484{ 1517{
1485 coro_cctx *cctx = cctx_new (); 1518 coro_cctx *cctx = cctx_new ();
1486 1519
1487 cctx->sptr = 0; 1520 cctx->stack.sptr = 0;
1488 coro_create (&cctx->cctx, 0, 0, 0, 0); 1521 coro_create (&cctx->cctx, 0, 0, 0, 0);
1489 1522
1490 return cctx; 1523 return cctx;
1491} 1524}
1492 1525
1493/* create a new cctx suitable as destination/running a perl interpreter */ 1526/* create a new cctx suitable as destination/running a perl interpreter */
1494static coro_cctx * 1527static coro_cctx *
1495cctx_new_run (void) 1528cctx_new_run (void)
1496{ 1529{
1497 coro_cctx *cctx = cctx_new (); 1530 coro_cctx *cctx = cctx_new ();
1498 void *stack_start;
1499 size_t stack_size;
1500 1531
1501#if HAVE_MMAP 1532 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1502 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1503 /* mmap supposedly does allocate-on-write for us */
1504 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1505
1506 if (cctx->sptr != (void *)-1)
1507 {
1508 #if CORO_STACKGUARD
1509 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1510 #endif
1511 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1512 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1513 cctx->flags |= CC_MAPPED;
1514 } 1533 {
1515 else
1516#endif
1517 {
1518 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1519 New (0, cctx->sptr, cctx_stacksize, long);
1520
1521 if (!cctx->sptr)
1522 {
1523 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1534 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1524 _exit (EXIT_FAILURE); 1535 _exit (EXIT_FAILURE);
1525 }
1526
1527 stack_start = cctx->sptr;
1528 stack_size = cctx->ssize;
1529 } 1536 }
1530 1537
1531 #if CORO_USE_VALGRIND
1532 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1533 #endif
1534
1535 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1538 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1536 1539
1537 return cctx; 1540 return cctx;
1538} 1541}
1539 1542
1540static void 1543static void
… …
1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1547 1550
1548 --cctx_count; 1551 --cctx_count;
1549 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1550 1553
1551 /* coro_transfer creates new, empty cctx's */ 1554 coro_stack_free (&cctx->stack);
1552 if (cctx->sptr)
1553 {
1554 #if CORO_USE_VALGRIND
1555 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1556 #endif
1557
1558#if HAVE_MMAP
1559 if (cctx->flags & CC_MAPPED)
1560 munmap (cctx->sptr, cctx->ssize);
1561 else
1562#endif
1563 Safefree (cctx->sptr);
1564 }
1565 1555
1566 Safefree (cctx); 1556 Safefree (cctx);
1567} 1557}
1568 1558
1569/* wether this cctx should be destructed */ 1559/* wether this cctx should be destructed */
… …
1588} 1578}
1589 1579
1590static void 1580static void
1591cctx_put (coro_cctx *cctx) 1581cctx_put (coro_cctx *cctx)
1592{ 1582{
1593 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1583 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1594 1584
1595 /* free another cctx if overlimit */ 1585 /* free another cctx if overlimit */
1596 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1586 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1597 { 1587 {
1598 coro_cctx *first = cctx_first; 1588 coro_cctx *first = cctx_first;
… …
1724 return; 1714 return;
1725 1715
1726 slf_destroy (aTHX_ coro); 1716 slf_destroy (aTHX_ coro);
1727 1717
1728 coro->flags |= CF_ZOMBIE; 1718 coro->flags |= CF_ZOMBIE;
1729 1719
1730 if (coro->flags & CF_READY) 1720 if (coro->flags & CF_READY)
1731 { 1721 {
1732 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1722 /* reduce nready, as destroying a ready coro effectively unreadies it */
1733 /* alternative: look through all ready queues and remove the coro */ 1723 /* alternative: look through all ready queues and remove the coro */
1734 --coro_nready; 1724 --coro_nready;
… …
1930 /* nothing to schedule: call the idle handler */ 1920 /* nothing to schedule: call the idle handler */
1931 if (SvROK (sv_idle) 1921 if (SvROK (sv_idle)
1932 && SvOBJECT (SvRV (sv_idle))) 1922 && SvOBJECT (SvRV (sv_idle)))
1933 { 1923 {
1934 if (SvRV (sv_idle) == SvRV (coro_current)) 1924 if (SvRV (sv_idle) == SvRV (coro_current))
1925 {
1926 require_pv ("Carp");
1927
1928 {
1929 dSP;
1930
1931 ENTER;
1932 SAVETMPS;
1933
1934 PUSHMARK (SP);
1935 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1935 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1936 PUTBACK;
1937 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1938
1939 FREETMPS;
1940 LEAVE;
1941 }
1942 }
1936 1943
1937 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1938 api_ready (aTHX_ SvRV (sv_idle)); 1945 api_ready (aTHX_ SvRV (sv_idle));
1939 --coro_nready; 1946 --coro_nready;
1940 } 1947 }
… …
2138 AV *od = coro->on_destroy; 2145 AV *od = coro->on_destroy;
2139 2146
2140 if (!od) 2147 if (!od)
2141 return; 2148 return;
2142 2149
2150 coro->on_destroy = 0;
2151 sv_2mortal ((SV *)od);
2152
2143 while (AvFILLp (od) >= 0) 2153 while (AvFILLp (od) >= 0)
2144 { 2154 {
2145 SV *cb = sv_2mortal (av_pop (od)); 2155 SV *cb = sv_2mortal (av_pop (od));
2146 2156
2147 /* coro hv's (and only hv's at the moment) are supported as well */ 2157 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2167 2177
2168static void 2178static void
2169coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2179coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2170{ 2180{
2171 AV *av; 2181 AV *av;
2172 2182
2173 if (coro->status) 2183 if (coro->status)
2174 { 2184 {
2175 av = coro->status; 2185 av = coro->status;
2176 av_clear (av); 2186 av_clear (av);
2177 } 2187 }
… …
2224 2234
2225 coro = SvSTATE (arg [0]); 2235 coro = SvSTATE (arg [0]);
2226 coro_hv = coro->hv; 2236 coro_hv = coro->hv;
2227 2237
2228 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2238 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2229 2239
2230 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2240 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2231 { 2241 {
2232 /* coro currently busy cancelling something, so just notify it */ 2242 /* coro currently busy cancelling something, so just notify it */
2233 coro->slf_frame.data = (void *)coro; 2243 coro->slf_frame.data = (void *)coro;
2234 2244
… …
2241 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2251 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2242 } 2252 }
2243 else 2253 else
2244 { 2254 {
2245 struct coro *self = SvSTATE_current; 2255 struct coro *self = SvSTATE_current;
2256
2257 if (!self)
2258 croak ("Coro::cancel called outside of thread content,");
2246 2259
2247 /* otherwise we cancel directly, purely for speed reasons 2260 /* otherwise we cancel directly, purely for speed reasons
2248 * unfortunately, this requires some magic trickery, as 2261 * unfortunately, this requires some magic trickery, as
2249 * somebody else could cancel us, so we have to fight the cancellation. 2262 * somebody else could cancel us, so we have to fight the cancellation.
2250 * this is ugly, and hopefully fully worth the extra speed. 2263 * this is ugly, and hopefully fully worth the extra speed.
… …
2413 2426
2414static int 2427static int
2415slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2428slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2416{ 2429{
2417 SV *data = (SV *)frame->data; 2430 SV *data = (SV *)frame->data;
2418 2431
2419 if (CORO_THROW) 2432 if (CORO_THROW)
2420 return 0; 2433 return 0;
2421 2434
2422 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2435 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2423 return 1; 2436 return 1;
… …
2459 cb = sv_2mortal (coro->rouse_cb); 2472 cb = sv_2mortal (coro->rouse_cb);
2460 coro->rouse_cb = 0; 2473 coro->rouse_cb = 0;
2461 } 2474 }
2462 2475
2463 if (!SvROK (cb) 2476 if (!SvROK (cb)
2464 || SvTYPE (SvRV (cb)) != SVt_PVCV 2477 || SvTYPE (SvRV (cb)) != SVt_PVCV
2465 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2478 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2466 croak ("Coro::rouse_wait called with illegal callback argument,"); 2479 croak ("Coro::rouse_wait called with illegal callback argument,");
2467 2480
2468 { 2481 {
2469 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2482 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2592 2605
2593/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2606/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2594static void 2607static void
2595slf_destroy (pTHX_ struct coro *coro) 2608slf_destroy (pTHX_ struct coro *coro)
2596{ 2609{
2597 /* this callback is reserved for slf functions needing to do cleanup */ 2610 struct CoroSLF frame = coro->slf_frame;
2598 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2599 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2600 2611
2601 /* 2612 /*
2602 * The on_destroy above most likely is from an SLF call. 2613 * The on_destroy below most likely is from an SLF call.
2603 * Since by definition the SLF call will not finish when we destroy 2614 * Since by definition the SLF call will not finish when we destroy
2604 * the coro, we will have to force-finish it here, otherwise 2615 * the coro, we will have to force-finish it here, otherwise
2605 * cleanup functions cannot call SLF functions. 2616 * cleanup functions cannot call SLF functions.
2606 */ 2617 */
2607 coro->slf_frame.prepare = 0; 2618 coro->slf_frame.prepare = 0;
2619
2620 /* this callback is reserved for slf functions needing to do cleanup */
2621 if (frame.destroy && frame.prepare && !PL_dirty)
2622 frame.destroy (aTHX_ &frame);
2608} 2623}
2609 2624
2610/* 2625/*
2611 * these not obviously related functions are all rolled into one 2626 * these not obviously related functions are all rolled into one
2612 * function to increase chances that they all will call transfer with the same 2627 * function to increase chances that they all will call transfer with the same
… …
2952{ 2967{
2953 AV *av = (AV *)frame->data; 2968 AV *av = (AV *)frame->data;
2954 SV *count_sv = AvARRAY (av)[0]; 2969 SV *count_sv = AvARRAY (av)[0];
2955 SV *coro_hv = SvRV (coro_current); 2970 SV *coro_hv = SvRV (coro_current);
2956 2971
2972 frame->destroy = 0;
2973
2957 /* if we are about to throw, don't actually acquire the lock, just throw */ 2974 /* if we are about to throw, don't actually acquire the lock, just throw */
2958 if (CORO_THROW) 2975 if (ecb_expect_false (CORO_THROW))
2976 {
2977 /* we still might be responsible for the semaphore, so wake up others */
2978 coro_semaphore_adjust (aTHX_ av, 0);
2979
2959 return 0; 2980 return 0;
2981 }
2960 else if (SvIVX (count_sv) > 0) 2982 else if (SvIVX (count_sv) > 0)
2961 { 2983 {
2962 frame->destroy = 0;
2963
2964 if (acquire) 2984 if (acquire)
2965 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2985 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2966 else 2986 else
2967 coro_semaphore_adjust (aTHX_ av, 0); 2987 coro_semaphore_adjust (aTHX_ av, 0);
2968 2988
… …
3190 /* it quickly returns */ 3210 /* it quickly returns */
3191 if (CORO_THROW) 3211 if (CORO_THROW)
3192 return 0; 3212 return 0;
3193 3213
3194 /* one element that is an RV? repeat! */ 3214 /* one element that is an RV? repeat! */
3195 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3215 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3196 return 1; 3216 return 1;
3197 3217
3198 /* restore status */ 3218 /* restore status */
3199 { 3219 {
3200 SV *data_sv = av_pop (state); 3220 SV *data_sv = av_pop (state);
… …
3390 int count; 3410 int count;
3391 3411
3392 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3412 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3393 3413
3394 PUSHMARK (SP); 3414 PUSHMARK (SP);
3395#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3415 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3396# include "state.h" 3416 #include "state.h"
3397#undef VARx
3398 count = call_pv ("Coro::State::_jit", G_ARRAY); 3417 count = call_pv ("Coro::State::_jit", G_ARRAY);
3399 SPAGAIN; 3418 SPAGAIN;
3400 3419
3401 save = POPs; save_ptr = SvPVbyte (save, save_len); 3420 save = POPs; save_ptr = SvPVbyte (save, save_len);
3402 load = POPs; load_ptr = SvPVbyte (load, load_len); 3421 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3429 3448
3430PROTOTYPES: DISABLE 3449PROTOTYPES: DISABLE
3431 3450
3432BOOT: 3451BOOT:
3433{ 3452{
3453#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3454#include "state.h"
3434#ifdef USE_ITHREADS 3455#ifdef USE_ITHREADS
3435# if CORO_PTHREAD 3456# if CORO_PTHREAD
3436 coro_thx = PERL_GET_CONTEXT; 3457 coro_thx = PERL_GET_CONTEXT;
3437# endif 3458# endif
3438#endif 3459#endif
3439 BOOT_PAGESIZE;
3440
3441 /* perl defines these to check for existance first, but why it doesn't */ 3460 /* perl defines these to check for existance first, but why it doesn't */
3442 /* just create them one at init time is not clear to me, except for */ 3461 /* just create them one at init time is not clear to me, except for */
3443 /* programs trying to delete them, but... */ 3462 /* programs trying to delete them, but... */
3444 /* anyway, we declare this as invalid and make sure they are initialised here */ 3463 /* anyway, we declare this as invalid and make sure they are initialised here */
3445 DEFSV; 3464 DEFSV;
… …
3515void 3534void
3516transfer (...) 3535transfer (...)
3517 PROTOTYPE: $$ 3536 PROTOTYPE: $$
3518 CODE: 3537 CODE:
3519 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3538 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3520
3521void
3522_exit (int code)
3523 PROTOTYPE: $
3524 CODE:
3525 _exit (code);
3526 3539
3527SV * 3540SV *
3528clone (Coro::State coro) 3541clone (Coro::State coro)
3529 CODE: 3542 CODE:
3530{ 3543{
… …
3585void 3598void
3586list () 3599list ()
3587 PROTOTYPE: 3600 PROTOTYPE:
3588 PPCODE: 3601 PPCODE:
3589{ 3602{
3590 struct coro *coro; 3603 struct coro *coro;
3591 for (coro = coro_first; coro; coro = coro->next) 3604 for (coro = coro_first; coro; coro = coro->next)
3592 if (coro->hv) 3605 if (coro->hv)
3593 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3606 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3594} 3607}
3595 3608
… …
3659 RETVAL = boolSV (coro->flags & ix); 3672 RETVAL = boolSV (coro->flags & ix);
3660 OUTPUT: 3673 OUTPUT:
3661 RETVAL 3674 RETVAL
3662 3675
3663void 3676void
3664throw (Coro::State self, SV *exception = &PL_sv_undef) 3677throw (SV *self, SV *exception = &PL_sv_undef)
3665 PROTOTYPE: $;$ 3678 PROTOTYPE: $;$
3666 CODE: 3679 CODE:
3667{ 3680{
3681 struct coro *coro = SvSTATE (self);
3668 struct coro *current = SvSTATE_current; 3682 struct coro *current = SvSTATE_current;
3669 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3683 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3670 SvREFCNT_dec (*exceptionp); 3684 SvREFCNT_dec (*exceptionp);
3671 SvGETMAGIC (exception); 3685 SvGETMAGIC (exception);
3672 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3686 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3687
3688 api_ready (aTHX_ self);
3673} 3689}
3674 3690
3675void 3691void
3676api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3692api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3677 PROTOTYPE: $;$ 3693 PROTOTYPE: $;$
… …
3754 3770
3755void 3771void
3756times (Coro::State self) 3772times (Coro::State self)
3757 PPCODE: 3773 PPCODE:
3758{ 3774{
3759 struct coro *current = SvSTATE (coro_current); 3775 struct coro *current = SvSTATE (coro_current);
3760 3776
3761 if (ecb_expect_false (current == self)) 3777 if (ecb_expect_false (current == self))
3762 { 3778 {
3763 coro_times_update (); 3779 coro_times_update ();
3764 coro_times_add (SvSTATE (coro_current)); 3780 coro_times_add (SvSTATE (coro_current));
… …
3807 3823
3808 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3824 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3809 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3825 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3810 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3826 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3811 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3827 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3812 3828
3813 coro_stash = gv_stashpv ("Coro", TRUE); 3829 coro_stash = gv_stashpv ("Coro", TRUE);
3814 3830
3815 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3816 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3832 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3817 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3833 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4039 on_leave = 1 4055 on_leave = 1
4040 PROTOTYPE: & 4056 PROTOTYPE: &
4041 CODE: 4057 CODE:
4042{ 4058{
4043 struct coro *coro = SvSTATE_current; 4059 struct coro *coro = SvSTATE_current;
4044 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4060 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4045 4061
4046 block = s_get_cv_croak (block); 4062 block = s_get_cv_croak (block);
4047 4063
4048 if (!*avp) 4064 if (!*avp)
4049 *avp = newAV (); 4065 *avp = newAV ();
… …
4069 4085
4070SV * 4086SV *
4071new (SV *klass, SV *count = 0) 4087new (SV *klass, SV *count = 0)
4072 CODE: 4088 CODE:
4073{ 4089{
4074 int semcnt = 1; 4090 int semcnt = 1;
4075 4091
4076 if (count) 4092 if (count)
4077 { 4093 {
4078 SvGETMAGIC (count); 4094 SvGETMAGIC (count);
4079 4095
… …
4139 XSRETURN_NO; 4155 XSRETURN_NO;
4140} 4156}
4141 4157
4142void 4158void
4143waiters (SV *self) 4159waiters (SV *self)
4144 PPCODE: 4160 PPCODE:
4145{ 4161{
4146 AV *av = (AV *)SvRV (self); 4162 AV *av = (AV *)SvRV (self);
4147 int wcount = AvFILLp (av) + 1 - 1; 4163 int wcount = AvFILLp (av) + 1 - 1;
4148 4164
4149 if (GIMME_V == G_SCALAR) 4165 if (GIMME_V == G_SCALAR)
… …
4161 4177
4162void 4178void
4163_may_delete (SV *sem, int count, unsigned int extra_refs) 4179_may_delete (SV *sem, int count, unsigned int extra_refs)
4164 PPCODE: 4180 PPCODE:
4165{ 4181{
4166 AV *av = (AV *)SvRV (sem); 4182 AV *av = (AV *)SvRV (sem);
4167 4183
4168 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4184 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4169 && AvFILLp (av) == 0 /* no waiters, just count */ 4185 && AvFILLp (av) == 0 /* no waiters, just count */
4170 && SvIV (AvARRAY (av)[0]) == count) 4186 && SvIV (AvARRAY (av)[0]) == count)
4171 XSRETURN_YES; 4187 XSRETURN_YES;
… …
4192 4208
4193void 4209void
4194broadcast (SV *self) 4210broadcast (SV *self)
4195 CODE: 4211 CODE:
4196{ 4212{
4197 AV *av = (AV *)SvRV (self); 4213 AV *av = (AV *)SvRV (self);
4198 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4214 coro_signal_wake (aTHX_ av, AvFILLp (av));
4199} 4215}
4200 4216
4201void 4217void
4202send (SV *self) 4218send (SV *self)
… …
4210 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4226 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4211} 4227}
4212 4228
4213IV 4229IV
4214awaited (SV *self) 4230awaited (SV *self)
4215 CODE: 4231 CODE:
4216 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4232 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4217 OUTPUT: 4233 OUTPUT:
4218 RETVAL 4234 RETVAL
4219 4235
4220 4236
… …
4225 4241
4226void 4242void
4227_schedule (...) 4243_schedule (...)
4228 CODE: 4244 CODE:
4229{ 4245{
4230 static int incede; 4246 static int incede;
4231 4247
4232 api_cede_notself (aTHX); 4248 api_cede_notself (aTHX);
4233 4249
4234 ++incede; 4250 ++incede;
4235 while (coro_nready >= incede && api_cede (aTHX)) 4251 while (coro_nready >= incede && api_cede (aTHX))
… …
4279 { 4295 {
4280 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4296 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4281 coro_old_pp_sselect = 0; 4297 coro_old_pp_sselect = 0;
4282 } 4298 }
4283 4299
4300MODULE = Coro::State PACKAGE = Coro::Util
4301
4302void
4303_exit (int code)
4304 CODE:
4305 _exit (code);
4306
4307NV
4308time ()
4309 CODE:
4310 RETVAL = nvtime (aTHX);
4311 OUTPUT:
4312 RETVAL
4313
4314NV
4315gettimeofday ()
4316 PPCODE:
4317{
4318 UV tv [2];
4319 u2time (aTHX_ tv);
4320 EXTEND (SP, 2);
4321 PUSHs (sv_2mortal (newSVuv (tv [0])));
4322 PUSHs (sv_2mortal (newSVuv (tv [1])));
4323}
4324

Diff Legend

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