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.414 by root, Wed Jun 29 16:08:31 2011 UTC vs.
Revision 1.443 by root, Thu Mar 6 06:40:32 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_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
1004 return 0; 1035 return 0;
1005 } 1036 }
1006 } 1037 }
1007 1038
1008 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1102 PL_hints = 0; 1133 PL_hints = 0;
1103 1134
1104 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1105 PL_diehook = SvREFCNT_inc (rv_diehook); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1106 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1107 1138
1108 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1109 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1110 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1111 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);
1112 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = 0;
… …
1405transfer_tail (pTHX) 1436transfer_tail (pTHX)
1406{ 1437{
1407 free_coro_mortal (aTHX); 1438 free_coro_mortal (aTHX);
1408} 1439}
1409 1440
1441/* try to exit the same way perl's main function would do */
1442/* we do not bother resetting the environment or other things *7
1443/* that are not, uhm, essential */
1444/* this obviously also doesn't work when perl is embedded */
1445static void ecb_noinline ecb_cold
1446perlish_exit (pTHX)
1447{
1448 int exitstatus = perl_destruct (PL_curinterp);
1449 perl_free (PL_curinterp);
1450 exit (exitstatus);
1451}
1452
1410/* 1453/*
1411 * this is a _very_ stripped down perl interpreter ;) 1454 * this is a _very_ stripped down perl interpreter ;)
1412 */ 1455 */
1413static void 1456static void
1414cctx_run (void *arg) 1457cctx_run (void *arg)
… …
1441 */ 1484 */
1442 1485
1443 /* 1486 /*
1444 * If perl-run returns we assume exit() was being called or the coro 1487 * If perl-run returns we assume exit() was being called or the coro
1445 * fell off the end, which seems to be the only valid (non-bug) 1488 * fell off the end, which seems to be the only valid (non-bug)
1446 * reason for perl_run to return. We try to exit by jumping to the 1489 * reason for perl_run to return. We try to mimic whatever perl is normally
1447 * bootstrap-time "top" top_env, as we cannot restore the "main" 1490 * doing in that case. YMMV.
1448 * coroutine as Coro has no such concept.
1449 * This actually isn't valid with the pthread backend, but OSes requiring
1450 * that backend are too broken to do it in a standards-compliant way.
1451 */ 1491 */
1452 PL_top_env = main_top_env; 1492 perlish_exit (aTHX);
1453 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1454 } 1493 }
1455} 1494}
1456 1495
1457static coro_cctx * 1496static coro_cctx *
1458cctx_new (void) 1497cctx_new (void)
… …
1473static coro_cctx * 1512static coro_cctx *
1474cctx_new_empty (void) 1513cctx_new_empty (void)
1475{ 1514{
1476 coro_cctx *cctx = cctx_new (); 1515 coro_cctx *cctx = cctx_new ();
1477 1516
1478 cctx->sptr = 0; 1517 cctx->stack.sptr = 0;
1479 coro_create (&cctx->cctx, 0, 0, 0, 0); 1518 coro_create (&cctx->cctx, 0, 0, 0, 0);
1480 1519
1481 return cctx; 1520 return cctx;
1482} 1521}
1483 1522
1484/* create a new cctx suitable as destination/running a perl interpreter */ 1523/* create a new cctx suitable as destination/running a perl interpreter */
1485static coro_cctx * 1524static coro_cctx *
1486cctx_new_run (void) 1525cctx_new_run (void)
1487{ 1526{
1488 coro_cctx *cctx = cctx_new (); 1527 coro_cctx *cctx = cctx_new ();
1489 void *stack_start;
1490 size_t stack_size;
1491 1528
1492#if HAVE_MMAP 1529 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1493 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1494 /* mmap supposedly does allocate-on-write for us */
1495 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1496
1497 if (cctx->sptr != (void *)-1)
1498 {
1499 #if CORO_STACKGUARD
1500 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1501 #endif
1502 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1503 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1504 cctx->flags |= CC_MAPPED;
1505 } 1530 {
1506 else
1507#endif
1508 {
1509 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1510 New (0, cctx->sptr, cctx_stacksize, long);
1511
1512 if (!cctx->sptr)
1513 {
1514 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1531 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1515 _exit (EXIT_FAILURE); 1532 _exit (EXIT_FAILURE);
1516 }
1517
1518 stack_start = cctx->sptr;
1519 stack_size = cctx->ssize;
1520 } 1533 }
1521 1534
1522 #if CORO_USE_VALGRIND
1523 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1524 #endif
1525
1526 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1535 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1527 1536
1528 return cctx; 1537 return cctx;
1529} 1538}
1530 1539
1531static void 1540static void
… …
1537 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1538 1547
1539 --cctx_count; 1548 --cctx_count;
1540 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1541 1550
1542 /* coro_transfer creates new, empty cctx's */ 1551 coro_stack_free (&cctx->stack);
1543 if (cctx->sptr)
1544 {
1545 #if CORO_USE_VALGRIND
1546 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1547 #endif
1548
1549#if HAVE_MMAP
1550 if (cctx->flags & CC_MAPPED)
1551 munmap (cctx->sptr, cctx->ssize);
1552 else
1553#endif
1554 Safefree (cctx->sptr);
1555 }
1556 1552
1557 Safefree (cctx); 1553 Safefree (cctx);
1558} 1554}
1559 1555
1560/* wether this cctx should be destructed */ 1556/* wether this cctx should be destructed */
… …
1579} 1575}
1580 1576
1581static void 1577static void
1582cctx_put (coro_cctx *cctx) 1578cctx_put (coro_cctx *cctx)
1583{ 1579{
1584 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1580 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1585 1581
1586 /* free another cctx if overlimit */ 1582 /* free another cctx if overlimit */
1587 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1583 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1588 { 1584 {
1589 coro_cctx *first = cctx_first; 1585 coro_cctx *first = cctx_first;
… …
1715 return; 1711 return;
1716 1712
1717 slf_destroy (aTHX_ coro); 1713 slf_destroy (aTHX_ coro);
1718 1714
1719 coro->flags |= CF_ZOMBIE; 1715 coro->flags |= CF_ZOMBIE;
1720 1716
1721 if (coro->flags & CF_READY) 1717 if (coro->flags & CF_READY)
1722 { 1718 {
1723 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1719 /* reduce nready, as destroying a ready coro effectively unreadies it */
1724 /* alternative: look through all ready queues and remove the coro */ 1720 /* alternative: look through all ready queues and remove the coro */
1725 --coro_nready; 1721 --coro_nready;
… …
1921 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1922 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1923 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1924 { 1920 {
1925 if (SvRV (sv_idle) == SvRV (coro_current)) 1921 if (SvRV (sv_idle) == SvRV (coro_current))
1922 {
1923 require_pv ("Carp");
1924
1925 {
1926 dSP;
1927
1928 ENTER;
1929 SAVETMPS;
1930
1931 PUSHMARK (SP);
1926 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935
1936 FREETMPS;
1937 LEAVE;
1938 }
1939 }
1927 1940
1928 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1941 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1929 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1930 --coro_nready; 1943 --coro_nready;
1931 } 1944 }
… …
2129 AV *od = coro->on_destroy; 2142 AV *od = coro->on_destroy;
2130 2143
2131 if (!od) 2144 if (!od)
2132 return; 2145 return;
2133 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
2134 while (AvFILLp (od) >= 0) 2150 while (AvFILLp (od) >= 0)
2135 { 2151 {
2136 SV *cb = sv_2mortal (av_pop (od)); 2152 SV *cb = sv_2mortal (av_pop (od));
2137 2153
2138 /* coro hv's (and only hv's at the moment) are supported as well */ 2154 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2158 2174
2159static void 2175static void
2160coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2161{ 2177{
2162 AV *av; 2178 AV *av;
2163 2179
2164 if (coro->status) 2180 if (coro->status)
2165 { 2181 {
2166 av = coro->status; 2182 av = coro->status;
2167 av_clear (av); 2183 av_clear (av);
2168 } 2184 }
… …
2215 2231
2216 coro = SvSTATE (arg [0]); 2232 coro = SvSTATE (arg [0]);
2217 coro_hv = coro->hv; 2233 coro_hv = coro->hv;
2218 2234
2219 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2220 2236
2221 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2222 { 2238 {
2223 /* coro currently busy cancelling something, so just notify it */ 2239 /* coro currently busy cancelling something, so just notify it */
2224 coro->slf_frame.data = (void *)coro; 2240 coro->slf_frame.data = (void *)coro;
2225 2241
… …
2232 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2233 } 2249 }
2234 else 2250 else
2235 { 2251 {
2236 struct coro *self = SvSTATE_current; 2252 struct coro *self = SvSTATE_current;
2253
2254 if (!self)
2255 croak ("Coro::cancel called outside of thread content,");
2237 2256
2238 /* otherwise we cancel directly, purely for speed reasons 2257 /* otherwise we cancel directly, purely for speed reasons
2239 * unfortunately, this requires some magic trickery, as 2258 * unfortunately, this requires some magic trickery, as
2240 * somebody else could cancel us, so we have to fight the cancellation. 2259 * somebody else could cancel us, so we have to fight the cancellation.
2241 * this is ugly, and hopefully fully worth the extra speed. 2260 * this is ugly, and hopefully fully worth the extra speed.
… …
2404 2423
2405static int 2424static int
2406slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2425slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2407{ 2426{
2408 SV *data = (SV *)frame->data; 2427 SV *data = (SV *)frame->data;
2409 2428
2410 if (CORO_THROW) 2429 if (CORO_THROW)
2411 return 0; 2430 return 0;
2412 2431
2413 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2432 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2414 return 1; 2433 return 1;
… …
2450 cb = sv_2mortal (coro->rouse_cb); 2469 cb = sv_2mortal (coro->rouse_cb);
2451 coro->rouse_cb = 0; 2470 coro->rouse_cb = 0;
2452 } 2471 }
2453 2472
2454 if (!SvROK (cb) 2473 if (!SvROK (cb)
2455 || SvTYPE (SvRV (cb)) != SVt_PVCV 2474 || SvTYPE (SvRV (cb)) != SVt_PVCV
2456 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2475 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2457 croak ("Coro::rouse_wait called with illegal callback argument,"); 2476 croak ("Coro::rouse_wait called with illegal callback argument,");
2458 2477
2459 { 2478 {
2460 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2479 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2583 2602
2584/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2603/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2585static void 2604static void
2586slf_destroy (pTHX_ struct coro *coro) 2605slf_destroy (pTHX_ struct coro *coro)
2587{ 2606{
2588 /* this callback is reserved for slf functions needing to do cleanup */ 2607 struct CoroSLF frame = coro->slf_frame;
2589 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2590 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2591 2608
2592 /* 2609 /*
2593 * The on_destroy above most likely is from an SLF call. 2610 * The on_destroy below most likely is from an SLF call.
2594 * Since by definition the SLF call will not finish when we destroy 2611 * Since by definition the SLF call will not finish when we destroy
2595 * the coro, we will have to force-finish it here, otherwise 2612 * the coro, we will have to force-finish it here, otherwise
2596 * cleanup functions cannot call SLF functions. 2613 * cleanup functions cannot call SLF functions.
2597 */ 2614 */
2598 coro->slf_frame.prepare = 0; 2615 coro->slf_frame.prepare = 0;
2616
2617 /* this callback is reserved for slf functions needing to do cleanup */
2618 if (frame.destroy && frame.prepare && !PL_dirty)
2619 frame.destroy (aTHX_ &frame);
2599} 2620}
2600 2621
2601/* 2622/*
2602 * these not obviously related functions are all rolled into one 2623 * these not obviously related functions are all rolled into one
2603 * function to increase chances that they all will call transfer with the same 2624 * function to increase chances that they all will call transfer with the same
… …
2943{ 2964{
2944 AV *av = (AV *)frame->data; 2965 AV *av = (AV *)frame->data;
2945 SV *count_sv = AvARRAY (av)[0]; 2966 SV *count_sv = AvARRAY (av)[0];
2946 SV *coro_hv = SvRV (coro_current); 2967 SV *coro_hv = SvRV (coro_current);
2947 2968
2969 frame->destroy = 0;
2970
2948 /* if we are about to throw, don't actually acquire the lock, just throw */ 2971 /* if we are about to throw, don't actually acquire the lock, just throw */
2949 if (CORO_THROW) 2972 if (ecb_expect_false (CORO_THROW))
2973 {
2974 /* we still might be responsible for the semaphore, so wake up others */
2975 coro_semaphore_adjust (aTHX_ av, 0);
2976
2950 return 0; 2977 return 0;
2978 }
2951 else if (SvIVX (count_sv) > 0) 2979 else if (SvIVX (count_sv) > 0)
2952 { 2980 {
2953 frame->destroy = 0;
2954
2955 if (acquire) 2981 if (acquire)
2956 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2982 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2957 else 2983 else
2958 coro_semaphore_adjust (aTHX_ av, 0); 2984 coro_semaphore_adjust (aTHX_ av, 0);
2959 2985
… …
3181 /* it quickly returns */ 3207 /* it quickly returns */
3182 if (CORO_THROW) 3208 if (CORO_THROW)
3183 return 0; 3209 return 0;
3184 3210
3185 /* one element that is an RV? repeat! */ 3211 /* one element that is an RV? repeat! */
3186 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3212 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3187 return 1; 3213 return 1;
3188 3214
3189 /* restore status */ 3215 /* restore status */
3190 { 3216 {
3191 SV *data_sv = av_pop (state); 3217 SV *data_sv = av_pop (state);
… …
3381 int count; 3407 int count;
3382 3408
3383 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3409 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3384 3410
3385 PUSHMARK (SP); 3411 PUSHMARK (SP);
3386#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3412 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3387# include "state.h" 3413 #include "state.h"
3388#undef VARx
3389 count = call_pv ("Coro::State::_jit", G_ARRAY); 3414 count = call_pv ("Coro::State::_jit", G_ARRAY);
3390 SPAGAIN; 3415 SPAGAIN;
3391 3416
3392 save = POPs; save_ptr = SvPVbyte (save, save_len); 3417 save = POPs; save_ptr = SvPVbyte (save, save_len);
3393 load = POPs; load_ptr = SvPVbyte (load, load_len); 3418 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3425#ifdef USE_ITHREADS 3450#ifdef USE_ITHREADS
3426# if CORO_PTHREAD 3451# if CORO_PTHREAD
3427 coro_thx = PERL_GET_CONTEXT; 3452 coro_thx = PERL_GET_CONTEXT;
3428# endif 3453# endif
3429#endif 3454#endif
3430 BOOT_PAGESIZE;
3431
3432 /* perl defines these to check for existance first, but why it doesn't */ 3455 /* perl defines these to check for existance first, but why it doesn't */
3433 /* just create them one at init time is not clear to me, except for */ 3456 /* just create them one at init time is not clear to me, except for */
3434 /* programs trying to delete them, but... */ 3457 /* programs trying to delete them, but... */
3435 /* anyway, we declare this as invalid and make sure they are initialised here */ 3458 /* anyway, we declare this as invalid and make sure they are initialised here */
3436 DEFSV; 3459 DEFSV;
… …
3506void 3529void
3507transfer (...) 3530transfer (...)
3508 PROTOTYPE: $$ 3531 PROTOTYPE: $$
3509 CODE: 3532 CODE:
3510 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3533 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3511
3512void
3513_exit (int code)
3514 PROTOTYPE: $
3515 CODE:
3516 _exit (code);
3517 3534
3518SV * 3535SV *
3519clone (Coro::State coro) 3536clone (Coro::State coro)
3520 CODE: 3537 CODE:
3521{ 3538{
… …
3576void 3593void
3577list () 3594list ()
3578 PROTOTYPE: 3595 PROTOTYPE:
3579 PPCODE: 3596 PPCODE:
3580{ 3597{
3581 struct coro *coro; 3598 struct coro *coro;
3582 for (coro = coro_first; coro; coro = coro->next) 3599 for (coro = coro_first; coro; coro = coro->next)
3583 if (coro->hv) 3600 if (coro->hv)
3584 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3601 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3585} 3602}
3586 3603
… …
3650 RETVAL = boolSV (coro->flags & ix); 3667 RETVAL = boolSV (coro->flags & ix);
3651 OUTPUT: 3668 OUTPUT:
3652 RETVAL 3669 RETVAL
3653 3670
3654void 3671void
3655throw (Coro::State self, SV *exception = &PL_sv_undef) 3672throw (SV *self, SV *exception = &PL_sv_undef)
3656 PROTOTYPE: $;$ 3673 PROTOTYPE: $;$
3657 CODE: 3674 CODE:
3658{ 3675{
3676 struct coro *coro = SvSTATE (self);
3659 struct coro *current = SvSTATE_current; 3677 struct coro *current = SvSTATE_current;
3660 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3678 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3661 SvREFCNT_dec (*exceptionp); 3679 SvREFCNT_dec (*exceptionp);
3662 SvGETMAGIC (exception); 3680 SvGETMAGIC (exception);
3663 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3681 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3682
3683 api_ready (aTHX_ self);
3664} 3684}
3665 3685
3666void 3686void
3667api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3687api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3668 PROTOTYPE: $;$ 3688 PROTOTYPE: $;$
… …
3745 3765
3746void 3766void
3747times (Coro::State self) 3767times (Coro::State self)
3748 PPCODE: 3768 PPCODE:
3749{ 3769{
3750 struct coro *current = SvSTATE (coro_current); 3770 struct coro *current = SvSTATE (coro_current);
3751 3771
3752 if (ecb_expect_false (current == self)) 3772 if (ecb_expect_false (current == self))
3753 { 3773 {
3754 coro_times_update (); 3774 coro_times_update ();
3755 coro_times_add (SvSTATE (coro_current)); 3775 coro_times_add (SvSTATE (coro_current));
… …
3798 3818
3799 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3819 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3800 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3820 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3801 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3821 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3802 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3822 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3803 3823
3804 coro_stash = gv_stashpv ("Coro", TRUE); 3824 coro_stash = gv_stashpv ("Coro", TRUE);
3805 3825
3806 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3807 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3827 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3808 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3828 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4030 on_leave = 1 4050 on_leave = 1
4031 PROTOTYPE: & 4051 PROTOTYPE: &
4032 CODE: 4052 CODE:
4033{ 4053{
4034 struct coro *coro = SvSTATE_current; 4054 struct coro *coro = SvSTATE_current;
4035 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4055 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4036 4056
4037 block = s_get_cv_croak (block); 4057 block = s_get_cv_croak (block);
4038 4058
4039 if (!*avp) 4059 if (!*avp)
4040 *avp = newAV (); 4060 *avp = newAV ();
… …
4060 4080
4061SV * 4081SV *
4062new (SV *klass, SV *count = 0) 4082new (SV *klass, SV *count = 0)
4063 CODE: 4083 CODE:
4064{ 4084{
4065 int semcnt = 1; 4085 int semcnt = 1;
4066 4086
4067 if (count) 4087 if (count)
4068 { 4088 {
4069 SvGETMAGIC (count); 4089 SvGETMAGIC (count);
4070 4090
… …
4130 XSRETURN_NO; 4150 XSRETURN_NO;
4131} 4151}
4132 4152
4133void 4153void
4134waiters (SV *self) 4154waiters (SV *self)
4135 PPCODE: 4155 PPCODE:
4136{ 4156{
4137 AV *av = (AV *)SvRV (self); 4157 AV *av = (AV *)SvRV (self);
4138 int wcount = AvFILLp (av) + 1 - 1; 4158 int wcount = AvFILLp (av) + 1 - 1;
4139 4159
4140 if (GIMME_V == G_SCALAR) 4160 if (GIMME_V == G_SCALAR)
… …
4152 4172
4153void 4173void
4154_may_delete (SV *sem, int count, unsigned int extra_refs) 4174_may_delete (SV *sem, int count, unsigned int extra_refs)
4155 PPCODE: 4175 PPCODE:
4156{ 4176{
4157 AV *av = (AV *)SvRV (sem); 4177 AV *av = (AV *)SvRV (sem);
4158 4178
4159 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4179 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4160 && AvFILLp (av) == 0 /* no waiters, just count */ 4180 && AvFILLp (av) == 0 /* no waiters, just count */
4161 && SvIV (AvARRAY (av)[0]) == count) 4181 && SvIV (AvARRAY (av)[0]) == count)
4162 XSRETURN_YES; 4182 XSRETURN_YES;
… …
4183 4203
4184void 4204void
4185broadcast (SV *self) 4205broadcast (SV *self)
4186 CODE: 4206 CODE:
4187{ 4207{
4188 AV *av = (AV *)SvRV (self); 4208 AV *av = (AV *)SvRV (self);
4189 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4209 coro_signal_wake (aTHX_ av, AvFILLp (av));
4190} 4210}
4191 4211
4192void 4212void
4193send (SV *self) 4213send (SV *self)
… …
4201 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4221 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4202} 4222}
4203 4223
4204IV 4224IV
4205awaited (SV *self) 4225awaited (SV *self)
4206 CODE: 4226 CODE:
4207 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4227 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4208 OUTPUT: 4228 OUTPUT:
4209 RETVAL 4229 RETVAL
4210 4230
4211 4231
… …
4216 4236
4217void 4237void
4218_schedule (...) 4238_schedule (...)
4219 CODE: 4239 CODE:
4220{ 4240{
4221 static int incede; 4241 static int incede;
4222 4242
4223 api_cede_notself (aTHX); 4243 api_cede_notself (aTHX);
4224 4244
4225 ++incede; 4245 ++incede;
4226 while (coro_nready >= incede && api_cede (aTHX)) 4246 while (coro_nready >= incede && api_cede (aTHX))
… …
4270 { 4290 {
4271 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4291 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4272 coro_old_pp_sselect = 0; 4292 coro_old_pp_sselect = 0;
4273 } 4293 }
4274 4294
4295MODULE = Coro::State PACKAGE = Coro::Util
4296
4297void
4298_exit (int code)
4299 CODE:
4300 _exit (code);
4301
4302NV
4303time ()
4304 CODE:
4305 RETVAL = nvtime (aTHX);
4306 OUTPUT:
4307 RETVAL
4308
4309NV
4310gettimeofday ()
4311 PPCODE:
4312{
4313 UV tv [2];
4314 u2time (aTHX_ tv);
4315 EXTEND (SP, 2);
4316 PUSHs (sv_2mortal (newSVuv (tv [0])));
4317 PUSHs (sv_2mortal (newSVuv (tv [1])));
4318}
4319

Diff Legend

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