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.413 by root, Fri Jun 17 18:55:08 2011 UTC vs.
Revision 1.447 by root, Tue Oct 14 21:53: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 !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 68# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 69#endif
75 70
76/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
97# if CORO_PTHREAD 92# if CORO_PTHREAD
98static void *coro_thx; 93static void *coro_thx;
99# endif 94# endif
100#endif 95#endif
101 96
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 97#ifdef __linux
106# include <time.h> /* for timespec */ 98# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 99# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 100# ifdef SYS_clock_gettime
109# 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))
… …
172typedef struct coro_cctx 164typedef struct coro_cctx
173{ 165{
174 struct coro_cctx *next; 166 struct coro_cctx *next;
175 167
176 /* the stack */ 168 /* the stack */
177 void *sptr; 169 struct coro_stack stack;
178 size_t ssize;
179 170
180 /* cpu state */ 171 /* cpu state */
181 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
182 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
183 JMPENV *top_env; 176 JMPENV *top_env;
184 coro_context cctx; 177 coro_context cctx;
185 178
186 U32 gen; 179 U32 gen;
187#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
… …
207}; 200};
208 201
209/* 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 */
210typedef struct 203typedef struct
211{ 204{
212#define VARx(name,expr,type) type name; 205 #define VARx(name,expr,type) type name;
213# include "state.h" 206 #include "state.h"
214#undef VARx
215} perl_slots; 207} perl_slots;
216 208
217/* how many context stack entries do we need for perl_slots */ 209/* how many context stack entries do we need for perl_slots */
218#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))
219 211
… …
291#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
292 284
293/** JIT *********************************************************************/ 285/** JIT *********************************************************************/
294 286
295#if CORO_JIT 287#if CORO_JIT
296 /* APPLE doesn't have HAVE_MMAP though */ 288 /* APPLE doesn't have mmap though */
297 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
298 #ifndef CORO_JIT_TYPE 290 #ifndef CORO_JIT_TYPE
299 #if __x86_64 && CORO_JIT_UNIXY 291 #if ECB_AMD64 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "amd64-unix" 292 #define CORO_JIT_TYPE "amd64-unix"
301 #elif __i386 && CORO_JIT_UNIXY 293 #elif __i386 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "x86-unix" 294 #define CORO_JIT_TYPE "x86-unix"
303 #endif 295 #endif
304 #endif 296 #endif
305#endif 297#endif
306 298
307#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
308 #undef CORO_JIT 300 #undef CORO_JIT
309#endif 301#endif
310 302
311#if CORO_JIT 303#if CORO_JIT
312 typedef void (*load_save_perl_slots_type)(perl_slots *); 304 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
369time_init (pTHX) 361time_init (pTHX)
370{ 362{
371 SV **svp; 363 SV **svp;
372 364
373 require_pv ("Time/HiRes.pm"); 365 require_pv ("Time/HiRes.pm");
374 366
375 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
376 368
377 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
378 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");
379 371
… …
520#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
521 513
522/*****************************************************************************/ 514/*****************************************************************************/
523/* padlist management and caching */ 515/* padlist management and caching */
524 516
525ecb_inline AV * 517ecb_inline PADLIST *
526coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
527{ 519{
528 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
529 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
530 524
531 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. */
532 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
533#if PERL_VERSION_ATLEAST (5,10,0)
534 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
535#else
536 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
537#endif 554#endif
538 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
539 --AvFILLp (padlist);
540 555
541 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
542 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
543 560
544 return newpadlist; 561 return newpadlist;
545} 562}
546 563
547ecb_inline void 564ecb_inline void
548free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
549{ 566{
550 /* may be during global destruction */ 567 /* may be during global destruction */
551 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
552 { 569 {
553 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
554 571
555 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
556 { 573 {
557 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
558 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
559 I32 j = AvFILLp (av);
560 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
561 while (j >= 0) 581 while (j >= 0)
562 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
563 583
564 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
565 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
566 } 587 }
567 588
568 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
569 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
570 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
571 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
572 } 599 }
573} 600}
574 601
575static int 602static int
576coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
577{ 604{
578 AV *padlist; 605 PADLIST *padlist;
579 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;
580 608
581 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
582 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
583 return 0; 611 return 0;
584 612
585 /* casting is fun. */ 613 while (len--)
586 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
587 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
588
589 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
590 615
591 return 0; 616 return 0;
592} 617}
593 618
594static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
… …
599/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
600ecb_inline void 625ecb_inline void
601get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
602{ 627{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av; 629 size_t *lenp;
605 630
606 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
607 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
608 else 633 else
609 { 634 {
610#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
611 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
612 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
622 647
623ecb_inline void 648ecb_inline void
624put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
625{ 650{
626 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
627 AV *av;
628 652
629 if (ecb_expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
630 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);
631 663
632 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
633
634 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
635 av_extend (av, AvFILLp (av) + 1);
636
637 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
638} 665}
639 666
640/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
641 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
642/* swap sv heads, at least logically */ 707/* swap sv heads, at least logically */
643static void 708static void
644swap_svs (pTHX_ Coro__State c) 709swap_svs (pTHX_ Coro__State c)
645{ 710{
646 int i; 711 int i;
647 712
648 for (i = 0; i <= AvFILLp (c->swap_sv); ) 713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
649 { 714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
650 SV *a = AvARRAY (c->swap_sv)[i++];
651 SV *b = AvARRAY (c->swap_sv)[i++];
652
653 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
654 SV tmp;
655
656 /* swap sv_any */
657 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
658
659 /* swap sv_flags */
660 SvFLAGS (&tmp) = SvFLAGS (a);
661 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
662 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
663
664#if PERL_VERSION_ATLEAST (5,10,0)
665 /* perl 5.10 complicates this _quite_ a bit, but it also is
666 * much faster, so no quarrels here. alternatively, we could
667 * sv_upgrade to avoid this.
668 */
669 {
670 /* swap sv_u */
671 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
672
673 /* if SvANY points to the head, we need to adjust the pointers,
674 * as the pointer for a still points to b, and maybe vice versa.
675 */
676 #define svany_in_head(type) \
677 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
678
679 if (svany_in_head (SvTYPE (a)))
680 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
681
682 if (svany_in_head (SvTYPE (b)))
683 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
684 }
685#endif
686 }
687} 715}
688 716
689#define SWAP_SVS(coro) \ 717#define SWAP_SVS(coro) \
690 if (ecb_expect_false ((coro)->swap_sv)) \ 718 if (ecb_expect_false ((coro)->swap_sv)) \
691 swap_svs (aTHX_ (coro)) 719 swap_svs (aTHX_ (coro))
… …
703 731
704#if CORO_JIT 732#if CORO_JIT
705 load_perl_slots (slot); 733 load_perl_slots (slot);
706#else 734#else
707 #define VARx(name,expr,type) expr = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
708 # include "state.h" 736 #include "state.h"
709 #undef VARx
710#endif 737#endif
711 738
712 { 739 {
713 dSP; 740 dSP;
714 741
… …
717 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
718 while (ecb_expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
719 { 746 {
720 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
721 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
722 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
723 } 750 }
724 751
725 PUTBACK; 752 PUTBACK;
726 } 753 }
727 754
… …
836 863
837#if CORO_JIT 864#if CORO_JIT
838 save_perl_slots (slot); 865 save_perl_slots (slot);
839#else 866#else
840 #define VARx(name,expr,type) slot->name = expr; 867 #define VARx(name,expr,type) slot->name = expr;
841 # include "state.h" 868 #include "state.h"
842 #undef VARx
843#endif 869#endif
844 } 870 }
845} 871}
846 872
847/* 873/*
… …
879#endif 905#endif
880 906
881 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
882 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
883 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
884 913
885 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
886 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
887 PL_savestack_max = 24; 916 PL_savestack_max = 24;
888 917
… …
916 } 945 }
917 946
918 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
919 Safefree (PL_markstack); 948 Safefree (PL_markstack);
920 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
921 Safefree (PL_savestack); 953 Safefree (PL_savestack);
922#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
923 Safefree (PL_retstack); 955 Safefree (PL_retstack);
924#endif 956#endif
925} 957}
… …
985 { 1017 {
986 SV **svp = 0; 1018 SV **svp = 0;
987 1019
988 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
989 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
990 1022
991 if (svp) 1023 if (svp)
992 { 1024 {
993 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);
994 return 0; 1035 return 0;
995 } 1036 }
996 } 1037 }
997 1038
998 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1092 PL_hints = 0; 1133 PL_hints = 0;
1093 1134
1094 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1095 PL_diehook = SvREFCNT_inc (rv_diehook); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1096 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1097 1138
1098 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1099 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1100 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1101 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);
1102 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
1103 PL_rs = newSVsv (GvSV (irsgv)); 1147 PL_rs = newSVsv (GvSV (irsgv));
1104 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1148 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1105 1149
1106 { 1150 {
1107 dSP; 1151 dSP;
… …
1395transfer_tail (pTHX) 1439transfer_tail (pTHX)
1396{ 1440{
1397 free_coro_mortal (aTHX); 1441 free_coro_mortal (aTHX);
1398} 1442}
1399 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
1400/* 1456/*
1401 * this is a _very_ stripped down perl interpreter ;) 1457 * this is a _very_ stripped down perl interpreter ;)
1402 */ 1458 */
1403static void 1459static void
1404cctx_run (void *arg) 1460cctx_run (void *arg)
… …
1431 */ 1487 */
1432 1488
1433 /* 1489 /*
1434 * 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
1435 * 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)
1436 * 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
1437 * bootstrap-time "top" top_env, as we cannot restore the "main" 1493 * doing in that case. YMMV.
1438 * coroutine as Coro has no such concept.
1439 * This actually isn't valid with the pthread backend, but OSes requiring
1440 * that backend are too broken to do it in a standards-compliant way.
1441 */ 1494 */
1442 PL_top_env = main_top_env; 1495 perlish_exit (aTHX);
1443 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1444 } 1496 }
1445} 1497}
1446 1498
1447static coro_cctx * 1499static coro_cctx *
1448cctx_new (void) 1500cctx_new (void)
… …
1463static coro_cctx * 1515static coro_cctx *
1464cctx_new_empty (void) 1516cctx_new_empty (void)
1465{ 1517{
1466 coro_cctx *cctx = cctx_new (); 1518 coro_cctx *cctx = cctx_new ();
1467 1519
1468 cctx->sptr = 0; 1520 cctx->stack.sptr = 0;
1469 coro_create (&cctx->cctx, 0, 0, 0, 0); 1521 coro_create (&cctx->cctx, 0, 0, 0, 0);
1470 1522
1471 return cctx; 1523 return cctx;
1472} 1524}
1473 1525
1474/* create a new cctx suitable as destination/running a perl interpreter */ 1526/* create a new cctx suitable as destination/running a perl interpreter */
1475static coro_cctx * 1527static coro_cctx *
1476cctx_new_run (void) 1528cctx_new_run (void)
1477{ 1529{
1478 coro_cctx *cctx = cctx_new (); 1530 coro_cctx *cctx = cctx_new ();
1479 void *stack_start;
1480 size_t stack_size;
1481 1531
1482#if HAVE_MMAP 1532 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1483 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1484 /* mmap supposedly does allocate-on-write for us */
1485 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1486
1487 if (cctx->sptr != (void *)-1)
1488 {
1489 #if CORO_STACKGUARD
1490 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1491 #endif
1492 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1493 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1494 cctx->flags |= CC_MAPPED;
1495 } 1533 {
1496 else
1497#endif
1498 {
1499 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1500 New (0, cctx->sptr, cctx_stacksize, long);
1501
1502 if (!cctx->sptr)
1503 {
1504 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1534 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1505 _exit (EXIT_FAILURE); 1535 _exit (EXIT_FAILURE);
1506 }
1507
1508 stack_start = cctx->sptr;
1509 stack_size = cctx->ssize;
1510 } 1536 }
1511 1537
1512 #if CORO_USE_VALGRIND
1513 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1514 #endif
1515
1516 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);
1517 1539
1518 return cctx; 1540 return cctx;
1519} 1541}
1520 1542
1521static void 1543static void
… …
1527 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1528 1550
1529 --cctx_count; 1551 --cctx_count;
1530 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1531 1553
1532 /* coro_transfer creates new, empty cctx's */ 1554 coro_stack_free (&cctx->stack);
1533 if (cctx->sptr)
1534 {
1535 #if CORO_USE_VALGRIND
1536 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1537 #endif
1538
1539#if HAVE_MMAP
1540 if (cctx->flags & CC_MAPPED)
1541 munmap (cctx->sptr, cctx->ssize);
1542 else
1543#endif
1544 Safefree (cctx->sptr);
1545 }
1546 1555
1547 Safefree (cctx); 1556 Safefree (cctx);
1548} 1557}
1549 1558
1550/* wether this cctx should be destructed */ 1559/* wether this cctx should be destructed */
… …
1569} 1578}
1570 1579
1571static void 1580static void
1572cctx_put (coro_cctx *cctx) 1581cctx_put (coro_cctx *cctx)
1573{ 1582{
1574 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));
1575 1584
1576 /* free another cctx if overlimit */ 1585 /* free another cctx if overlimit */
1577 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1586 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1578 { 1587 {
1579 coro_cctx *first = cctx_first; 1588 coro_cctx *first = cctx_first;
… …
1705 return; 1714 return;
1706 1715
1707 slf_destroy (aTHX_ coro); 1716 slf_destroy (aTHX_ coro);
1708 1717
1709 coro->flags |= CF_ZOMBIE; 1718 coro->flags |= CF_ZOMBIE;
1710 1719
1711 if (coro->flags & CF_READY) 1720 if (coro->flags & CF_READY)
1712 { 1721 {
1713 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1722 /* reduce nready, as destroying a ready coro effectively unreadies it */
1714 /* alternative: look through all ready queues and remove the coro */ 1723 /* alternative: look through all ready queues and remove the coro */
1715 --coro_nready; 1724 --coro_nready;
… …
1911 /* nothing to schedule: call the idle handler */ 1920 /* nothing to schedule: call the idle handler */
1912 if (SvROK (sv_idle) 1921 if (SvROK (sv_idle)
1913 && SvOBJECT (SvRV (sv_idle))) 1922 && SvOBJECT (SvRV (sv_idle)))
1914 { 1923 {
1915 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);
1916 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 }
1917 1943
1918 ++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 */
1919 api_ready (aTHX_ SvRV (sv_idle)); 1945 api_ready (aTHX_ SvRV (sv_idle));
1920 --coro_nready; 1946 --coro_nready;
1921 } 1947 }
… …
2119 AV *od = coro->on_destroy; 2145 AV *od = coro->on_destroy;
2120 2146
2121 if (!od) 2147 if (!od)
2122 return; 2148 return;
2123 2149
2150 coro->on_destroy = 0;
2151 sv_2mortal ((SV *)od);
2152
2124 while (AvFILLp (od) >= 0) 2153 while (AvFILLp (od) >= 0)
2125 { 2154 {
2126 SV *cb = sv_2mortal (av_pop (od)); 2155 SV *cb = sv_2mortal (av_pop (od));
2127 2156
2128 /* 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 */
… …
2148 2177
2149static void 2178static void
2150coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2179coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2151{ 2180{
2152 AV *av; 2181 AV *av;
2153 2182
2154 if (coro->status) 2183 if (coro->status)
2155 { 2184 {
2156 av = coro->status; 2185 av = coro->status;
2157 av_clear (av); 2186 av_clear (av);
2158 } 2187 }
… …
2205 2234
2206 coro = SvSTATE (arg [0]); 2235 coro = SvSTATE (arg [0]);
2207 coro_hv = coro->hv; 2236 coro_hv = coro->hv;
2208 2237
2209 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2238 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2210 2239
2211 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2240 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2212 { 2241 {
2213 /* coro currently busy cancelling something, so just notify it */ 2242 /* coro currently busy cancelling something, so just notify it */
2214 coro->slf_frame.data = (void *)coro; 2243 coro->slf_frame.data = (void *)coro;
2215 2244
… …
2222 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2251 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2223 } 2252 }
2224 else 2253 else
2225 { 2254 {
2226 struct coro *self = SvSTATE_current; 2255 struct coro *self = SvSTATE_current;
2256
2257 if (!self)
2258 croak ("Coro::cancel called outside of thread content,");
2227 2259
2228 /* otherwise we cancel directly, purely for speed reasons 2260 /* otherwise we cancel directly, purely for speed reasons
2229 * unfortunately, this requires some magic trickery, as 2261 * unfortunately, this requires some magic trickery, as
2230 * 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.
2231 * this is ugly, and hopefully fully worth the extra speed. 2263 * this is ugly, and hopefully fully worth the extra speed.
… …
2394 2426
2395static int 2427static int
2396slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2428slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2397{ 2429{
2398 SV *data = (SV *)frame->data; 2430 SV *data = (SV *)frame->data;
2399 2431
2400 if (CORO_THROW) 2432 if (CORO_THROW)
2401 return 0; 2433 return 0;
2402 2434
2403 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2435 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2404 return 1; 2436 return 1;
… …
2440 cb = sv_2mortal (coro->rouse_cb); 2472 cb = sv_2mortal (coro->rouse_cb);
2441 coro->rouse_cb = 0; 2473 coro->rouse_cb = 0;
2442 } 2474 }
2443 2475
2444 if (!SvROK (cb) 2476 if (!SvROK (cb)
2445 || SvTYPE (SvRV (cb)) != SVt_PVCV 2477 || SvTYPE (SvRV (cb)) != SVt_PVCV
2446 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2478 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2447 croak ("Coro::rouse_wait called with illegal callback argument,"); 2479 croak ("Coro::rouse_wait called with illegal callback argument,");
2448 2480
2449 { 2481 {
2450 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2482 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2573 2605
2574/* "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 */
2575static void 2607static void
2576slf_destroy (pTHX_ struct coro *coro) 2608slf_destroy (pTHX_ struct coro *coro)
2577{ 2609{
2578 /* this callback is reserved for slf functions needing to do cleanup */ 2610 struct CoroSLF frame = coro->slf_frame;
2579 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2580 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2581 2611
2582 /* 2612 /*
2583 * The on_destroy above most likely is from an SLF call. 2613 * The on_destroy below most likely is from an SLF call.
2584 * 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
2585 * the coro, we will have to force-finish it here, otherwise 2615 * the coro, we will have to force-finish it here, otherwise
2586 * cleanup functions cannot call SLF functions. 2616 * cleanup functions cannot call SLF functions.
2587 */ 2617 */
2588 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);
2589} 2623}
2590 2624
2591/* 2625/*
2592 * these not obviously related functions are all rolled into one 2626 * these not obviously related functions are all rolled into one
2593 * 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
… …
2933{ 2967{
2934 AV *av = (AV *)frame->data; 2968 AV *av = (AV *)frame->data;
2935 SV *count_sv = AvARRAY (av)[0]; 2969 SV *count_sv = AvARRAY (av)[0];
2936 SV *coro_hv = SvRV (coro_current); 2970 SV *coro_hv = SvRV (coro_current);
2937 2971
2972 frame->destroy = 0;
2973
2938 /* 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 */
2939 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
2940 return 0; 2980 return 0;
2981 }
2941 else if (SvIVX (count_sv) > 0) 2982 else if (SvIVX (count_sv) > 0)
2942 { 2983 {
2943 frame->destroy = 0;
2944
2945 if (acquire) 2984 if (acquire)
2946 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2985 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2947 else 2986 else
2948 coro_semaphore_adjust (aTHX_ av, 0); 2987 coro_semaphore_adjust (aTHX_ av, 0);
2949 2988
… …
3171 /* it quickly returns */ 3210 /* it quickly returns */
3172 if (CORO_THROW) 3211 if (CORO_THROW)
3173 return 0; 3212 return 0;
3174 3213
3175 /* one element that is an RV? repeat! */ 3214 /* one element that is an RV? repeat! */
3176 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3215 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3177 return 1; 3216 return 1;
3178 3217
3179 /* restore status */ 3218 /* restore status */
3180 { 3219 {
3181 SV *data_sv = av_pop (state); 3220 SV *data_sv = av_pop (state);
… …
3371 int count; 3410 int count;
3372 3411
3373 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3412 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3374 3413
3375 PUSHMARK (SP); 3414 PUSHMARK (SP);
3376#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));
3377# include "state.h" 3416 #include "state.h"
3378#undef VARx
3379 count = call_pv ("Coro::State::_jit", G_ARRAY); 3417 count = call_pv ("Coro::State::_jit", G_ARRAY);
3380 SPAGAIN; 3418 SPAGAIN;
3381 3419
3382 save = POPs; save_ptr = SvPVbyte (save, save_len); 3420 save = POPs; save_ptr = SvPVbyte (save, save_len);
3383 load = POPs; load_ptr = SvPVbyte (load, load_len); 3421 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3410 3448
3411PROTOTYPES: DISABLE 3449PROTOTYPES: DISABLE
3412 3450
3413BOOT: 3451BOOT:
3414{ 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"
3415#ifdef USE_ITHREADS 3455#ifdef USE_ITHREADS
3416# if CORO_PTHREAD 3456# if CORO_PTHREAD
3417 coro_thx = PERL_GET_CONTEXT; 3457 coro_thx = PERL_GET_CONTEXT;
3418# endif 3458# endif
3419#endif 3459#endif
3420 BOOT_PAGESIZE;
3421
3422 /* 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 */
3423 /* 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 */
3424 /* programs trying to delete them, but... */ 3462 /* programs trying to delete them, but... */
3425 /* 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 */
3426 DEFSV; 3464 DEFSV;
… …
3496void 3534void
3497transfer (...) 3535transfer (...)
3498 PROTOTYPE: $$ 3536 PROTOTYPE: $$
3499 CODE: 3537 CODE:
3500 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3538 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3501
3502void
3503_exit (int code)
3504 PROTOTYPE: $
3505 CODE:
3506 _exit (code);
3507 3539
3508SV * 3540SV *
3509clone (Coro::State coro) 3541clone (Coro::State coro)
3510 CODE: 3542 CODE:
3511{ 3543{
… …
3566void 3598void
3567list () 3599list ()
3568 PROTOTYPE: 3600 PROTOTYPE:
3569 PPCODE: 3601 PPCODE:
3570{ 3602{
3571 struct coro *coro; 3603 struct coro *coro;
3572 for (coro = coro_first; coro; coro = coro->next) 3604 for (coro = coro_first; coro; coro = coro->next)
3573 if (coro->hv) 3605 if (coro->hv)
3574 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3606 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3575} 3607}
3576 3608
… …
3640 RETVAL = boolSV (coro->flags & ix); 3672 RETVAL = boolSV (coro->flags & ix);
3641 OUTPUT: 3673 OUTPUT:
3642 RETVAL 3674 RETVAL
3643 3675
3644void 3676void
3645throw (Coro::State self, SV *exception = &PL_sv_undef) 3677throw (SV *self, SV *exception = &PL_sv_undef)
3646 PROTOTYPE: $;$ 3678 PROTOTYPE: $;$
3647 CODE: 3679 CODE:
3648{ 3680{
3681 struct coro *coro = SvSTATE (self);
3649 struct coro *current = SvSTATE_current; 3682 struct coro *current = SvSTATE_current;
3650 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3683 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3651 SvREFCNT_dec (*exceptionp); 3684 SvREFCNT_dec (*exceptionp);
3652 SvGETMAGIC (exception); 3685 SvGETMAGIC (exception);
3653 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3686 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3687
3688 api_ready (aTHX_ self);
3654} 3689}
3655 3690
3656void 3691void
3657api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3692api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3658 PROTOTYPE: $;$ 3693 PROTOTYPE: $;$
… …
3735 3770
3736void 3771void
3737times (Coro::State self) 3772times (Coro::State self)
3738 PPCODE: 3773 PPCODE:
3739{ 3774{
3740 struct coro *current = SvSTATE (coro_current); 3775 struct coro *current = SvSTATE (coro_current);
3741 3776
3742 if (ecb_expect_false (current == self)) 3777 if (ecb_expect_false (current == self))
3743 { 3778 {
3744 coro_times_update (); 3779 coro_times_update ();
3745 coro_times_add (SvSTATE (coro_current)); 3780 coro_times_add (SvSTATE (coro_current));
… …
3788 3823
3789 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);
3790 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3825 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3791 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);
3792 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 */
3793 3828
3794 coro_stash = gv_stashpv ("Coro", TRUE); 3829 coro_stash = gv_stashpv ("Coro", TRUE);
3795 3830
3796 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3797 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3832 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3798 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3833 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4020 on_leave = 1 4055 on_leave = 1
4021 PROTOTYPE: & 4056 PROTOTYPE: &
4022 CODE: 4057 CODE:
4023{ 4058{
4024 struct coro *coro = SvSTATE_current; 4059 struct coro *coro = SvSTATE_current;
4025 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4060 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4026 4061
4027 block = s_get_cv_croak (block); 4062 block = s_get_cv_croak (block);
4028 4063
4029 if (!*avp) 4064 if (!*avp)
4030 *avp = newAV (); 4065 *avp = newAV ();
… …
4050 4085
4051SV * 4086SV *
4052new (SV *klass, SV *count = 0) 4087new (SV *klass, SV *count = 0)
4053 CODE: 4088 CODE:
4054{ 4089{
4055 int semcnt = 1; 4090 int semcnt = 1;
4056 4091
4057 if (count) 4092 if (count)
4058 { 4093 {
4059 SvGETMAGIC (count); 4094 SvGETMAGIC (count);
4060 4095
… …
4120 XSRETURN_NO; 4155 XSRETURN_NO;
4121} 4156}
4122 4157
4123void 4158void
4124waiters (SV *self) 4159waiters (SV *self)
4125 PPCODE: 4160 PPCODE:
4126{ 4161{
4127 AV *av = (AV *)SvRV (self); 4162 AV *av = (AV *)SvRV (self);
4128 int wcount = AvFILLp (av) + 1 - 1; 4163 int wcount = AvFILLp (av) + 1 - 1;
4129 4164
4130 if (GIMME_V == G_SCALAR) 4165 if (GIMME_V == G_SCALAR)
… …
4142 4177
4143void 4178void
4144_may_delete (SV *sem, int count, unsigned int extra_refs) 4179_may_delete (SV *sem, int count, unsigned int extra_refs)
4145 PPCODE: 4180 PPCODE:
4146{ 4181{
4147 AV *av = (AV *)SvRV (sem); 4182 AV *av = (AV *)SvRV (sem);
4148 4183
4149 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4184 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4150 && AvFILLp (av) == 0 /* no waiters, just count */ 4185 && AvFILLp (av) == 0 /* no waiters, just count */
4151 && SvIV (AvARRAY (av)[0]) == count) 4186 && SvIV (AvARRAY (av)[0]) == count)
4152 XSRETURN_YES; 4187 XSRETURN_YES;
… …
4173 4208
4174void 4209void
4175broadcast (SV *self) 4210broadcast (SV *self)
4176 CODE: 4211 CODE:
4177{ 4212{
4178 AV *av = (AV *)SvRV (self); 4213 AV *av = (AV *)SvRV (self);
4179 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4214 coro_signal_wake (aTHX_ av, AvFILLp (av));
4180} 4215}
4181 4216
4182void 4217void
4183send (SV *self) 4218send (SV *self)
… …
4191 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4226 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4192} 4227}
4193 4228
4194IV 4229IV
4195awaited (SV *self) 4230awaited (SV *self)
4196 CODE: 4231 CODE:
4197 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4232 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4198 OUTPUT: 4233 OUTPUT:
4199 RETVAL 4234 RETVAL
4200 4235
4201 4236
… …
4206 4241
4207void 4242void
4208_schedule (...) 4243_schedule (...)
4209 CODE: 4244 CODE:
4210{ 4245{
4211 static int incede; 4246 static int incede;
4212 4247
4213 api_cede_notself (aTHX); 4248 api_cede_notself (aTHX);
4214 4249
4215 ++incede; 4250 ++incede;
4216 while (coro_nready >= incede && api_cede (aTHX)) 4251 while (coro_nready >= incede && api_cede (aTHX))
… …
4260 { 4295 {
4261 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4296 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4262 coro_old_pp_sselect = 0; 4297 coro_old_pp_sselect = 0;
4263 } 4298 }
4264 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