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.449 by root, Sun Jun 21 17:02:49 2015 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#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
26#endif 58#endif
27 59
28#if defined(_WIN32) 60#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 61# undef HAS_GETTIMEOFDAY
30# undef setjmp 62# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
34#else 66#else
35# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
36#endif 68#endif
37 69
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 */ 70/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
67 72
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 74# 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 75#endif
79 76
80/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
101# if CORO_PTHREAD 98# if CORO_PTHREAD
102static void *coro_thx; 99static void *coro_thx;
103# endif 100# endif
104#endif 101#endif
105 102
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux 103#ifdef __linux
110# include <time.h> /* for timespec */ 104# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */ 105# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime 106# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 107# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
176typedef struct coro_cctx 170typedef struct coro_cctx
177{ 171{
178 struct coro_cctx *next; 172 struct coro_cctx *next;
179 173
180 /* the stack */ 174 /* the stack */
181 void *sptr; 175 struct coro_stack stack;
182 size_t ssize;
183 176
184 /* cpu state */ 177 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
187 JMPENV *top_env; 182 JMPENV *top_env;
188 coro_context cctx; 183 coro_context cctx;
189 184
190 U32 gen; 185 U32 gen;
191#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
… …
211}; 206};
212 207
213/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
214typedef struct 209typedef struct
215{ 210{
216#define VARx(name,expr,type) type name; 211 #define VARx(name,expr,type) type name;
217# include "state.h" 212 #include "state.h"
218#undef VARx
219} perl_slots; 213} perl_slots;
220 214
221/* how many context stack entries do we need for perl_slots */ 215/* 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)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 217
… …
295#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
296 290
297/** JIT *********************************************************************/ 291/** JIT *********************************************************************/
298 292
299#if CORO_JIT 293#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */ 294 /* APPLE doesn't have mmap though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE 296 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY 297 #if ECB_AMD64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix" 298 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY 299 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix" 300 #define CORO_JIT_TYPE "x86-unix"
307 #endif 301 #endif
308 #endif 302 #endif
309#endif 303#endif
310 304
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
312 #undef CORO_JIT 306 #undef CORO_JIT
313#endif 307#endif
314 308
315#if CORO_JIT 309#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *); 310 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
373time_init (pTHX) 367time_init (pTHX)
374{ 368{
375 SV **svp; 369 SV **svp;
376 370
377 require_pv ("Time/HiRes.pm"); 371 require_pv ("Time/HiRes.pm");
378 372
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380 374
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383 377
… …
524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
525 519
526/*****************************************************************************/ 520/*****************************************************************************/
527/* padlist management and caching */ 521/* padlist management and caching */
528 522
529ecb_inline AV * 523ecb_inline PADLIST *
530coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
531{ 525{
532 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
533 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
534 531
535 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
536 AvREAL_off (newpadlist); 560 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 561#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
543 --AvFILLp (padlist);
544 562
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
546 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
547 571
548 return newpadlist; 572 return newpadlist;
549} 573}
550 574
551ecb_inline void 575ecb_inline void
552free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
553{ 577{
554 /* may be during global destruction */ 578 /* may be during global destruction */
555 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
556 { 580 {
557 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
558 582
559 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
560 { 584 {
561 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av);
564 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
565 while (j >= 0) 592 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 594
568 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
570 } 598 }
571 599
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
573 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
574 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
576 } 610 }
577} 611}
578 612
579static int 613static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 615{
582 AV *padlist; 616 PADLIST *padlist;
583 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
584 619
585 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
587 return 0; 622 return 0;
588 623
589 /* casting is fun. */ 624 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 626
595 return 0; 627 return 0;
596} 628}
597 629
598static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
604ecb_inline void 636ecb_inline void
605get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
606{ 638{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 640 size_t *lenp;
609 641
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 644 else
613 { 645 {
614#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
626 658
627ecb_inline void 659ecb_inline void
628put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
629{ 661{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 663
633 if (ecb_expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
635 674
636 av = (AV *)mg->mg_obj; 675 ((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} 676}
643 677
644/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
645 679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
646/* swap sv heads, at least logically */ 718/* swap sv heads, at least logically */
647static void 719static void
648swap_svs (pTHX_ Coro__State c) 720swap_svs (pTHX_ Coro__State c)
649{ 721{
650 int i; 722 int i;
651 723
652 for (i = 0; i <= AvFILLp (c->swap_sv); ) 724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
653 { 725 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} 726}
692 727
693#define SWAP_SVS(coro) \ 728#define SWAP_SVS(coro) \
694 if (ecb_expect_false ((coro)->swap_sv)) \ 729 if (ecb_expect_false ((coro)->swap_sv)) \
695 swap_svs (aTHX_ (coro)) 730 swap_svs (aTHX_ (coro))
… …
707 742
708#if CORO_JIT 743#if CORO_JIT
709 load_perl_slots (slot); 744 load_perl_slots (slot);
710#else 745#else
711 #define VARx(name,expr,type) expr = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
712 # include "state.h" 747 #include "state.h"
713 #undef VARx
714#endif 748#endif
715 749
716 { 750 {
717 dSP; 751 dSP;
718 752
… …
721 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
723 { 757 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 761 }
728 762
729 PUTBACK; 763 PUTBACK;
730 } 764 }
731 765
… …
840 874
841#if CORO_JIT 875#if CORO_JIT
842 save_perl_slots (slot); 876 save_perl_slots (slot);
843#else 877#else
844 #define VARx(name,expr,type) slot->name = expr; 878 #define VARx(name,expr,type) slot->name = expr;
845 # include "state.h" 879 #include "state.h"
846 #undef VARx
847#endif 880#endif
848 } 881 }
849} 882}
850 883
851/* 884/*
… …
995 { 1028 {
996 SV **svp = 0; 1029 SV **svp = 0;
997 1030
998 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
999 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1000 1033
1001 if (svp) 1034 if (svp)
1002 { 1035 {
1003 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef;
1040 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1041 ssv = sv_2mortal (newRV_inc (*svp));
1042 else
1043 ssv = *svp;
1044
1045 sv_setsv (sv, ssv);
1004 return 0; 1046 return 0;
1005 } 1047 }
1006 } 1048 }
1007 1049
1008 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1102 PL_hints = 0; 1144 PL_hints = 0;
1103 1145
1104 /* recreate the die/warn hooks */ 1146 /* recreate the die/warn hooks */
1105 PL_diehook = SvREFCNT_inc (rv_diehook); 1147 PL_diehook = SvREFCNT_inc (rv_diehook);
1106 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1148 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1107 1149
1108 GvSV (PL_defgv) = newSV (0); 1150 GvSV (PL_defgv) = newSV (0);
1109 GvAV (PL_defgv) = coro->args; coro->args = 0; 1151 GvAV (PL_defgv) = coro->args; coro->args = 0;
1110 GvSV (PL_errgv) = newSV (0); 1152 GvSV (PL_errgv) = newSV (0);
1111 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1153 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1112 GvHV (PL_hintgv) = 0; 1154 GvHV (PL_hintgv) = newHV ();
1155#if PERL_VERSION_ATLEAST (5,10,0)
1156 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1157#endif
1113 PL_rs = newSVsv (GvSV (irsgv)); 1158 PL_rs = newSVsv (GvSV (irsgv));
1114 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1159 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1115 1160
1116 { 1161 {
1117 dSP; 1162 dSP;
… …
1299 1344
1300 if (PL_curcop != &PL_compiling) 1345 if (PL_curcop != &PL_compiling)
1301 { 1346 {
1302 SV **cb; 1347 SV **cb;
1303 1348
1304 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1349 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1305 { 1350 {
1306 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1351 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1307 1352
1308 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1353 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1309 { 1354 {
… …
1405transfer_tail (pTHX) 1450transfer_tail (pTHX)
1406{ 1451{
1407 free_coro_mortal (aTHX); 1452 free_coro_mortal (aTHX);
1408} 1453}
1409 1454
1455/* try to exit the same way perl's main function would do */
1456/* we do not bother resetting the environment or other things *7
1457/* that are not, uhm, essential */
1458/* this obviously also doesn't work when perl is embedded */
1459static void ecb_noinline ecb_cold
1460perlish_exit (pTHX)
1461{
1462 int exitstatus = perl_destruct (PL_curinterp);
1463 perl_free (PL_curinterp);
1464 exit (exitstatus);
1465}
1466
1410/* 1467/*
1411 * this is a _very_ stripped down perl interpreter ;) 1468 * this is a _very_ stripped down perl interpreter ;)
1412 */ 1469 */
1413static void 1470static void
1414cctx_run (void *arg) 1471cctx_run (void *arg)
… …
1441 */ 1498 */
1442 1499
1443 /* 1500 /*
1444 * If perl-run returns we assume exit() was being called or the coro 1501 * 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) 1502 * 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 1503 * 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" 1504 * 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 */ 1505 */
1452 PL_top_env = main_top_env; 1506 perlish_exit (aTHX);
1453 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1454 } 1507 }
1455} 1508}
1456 1509
1457static coro_cctx * 1510static coro_cctx *
1458cctx_new (void) 1511cctx_new (void)
… …
1473static coro_cctx * 1526static coro_cctx *
1474cctx_new_empty (void) 1527cctx_new_empty (void)
1475{ 1528{
1476 coro_cctx *cctx = cctx_new (); 1529 coro_cctx *cctx = cctx_new ();
1477 1530
1478 cctx->sptr = 0; 1531 cctx->stack.sptr = 0;
1479 coro_create (&cctx->cctx, 0, 0, 0, 0); 1532 coro_create (&cctx->cctx, 0, 0, 0, 0);
1480 1533
1481 return cctx; 1534 return cctx;
1482} 1535}
1483 1536
1484/* create a new cctx suitable as destination/running a perl interpreter */ 1537/* create a new cctx suitable as destination/running a perl interpreter */
1485static coro_cctx * 1538static coro_cctx *
1486cctx_new_run (void) 1539cctx_new_run (void)
1487{ 1540{
1488 coro_cctx *cctx = cctx_new (); 1541 coro_cctx *cctx = cctx_new ();
1489 void *stack_start;
1490 size_t stack_size;
1491 1542
1492#if HAVE_MMAP 1543 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 } 1544 {
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."); 1545 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1515 _exit (EXIT_FAILURE); 1546 _exit (EXIT_FAILURE);
1516 }
1517
1518 stack_start = cctx->sptr;
1519 stack_size = cctx->ssize;
1520 } 1547 }
1521 1548
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); 1549 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1527 1550
1528 return cctx; 1551 return cctx;
1529} 1552}
1530 1553
1531static void 1554static void
… …
1537 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1560 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1538 1561
1539 --cctx_count; 1562 --cctx_count;
1540 coro_destroy (&cctx->cctx); 1563 coro_destroy (&cctx->cctx);
1541 1564
1542 /* coro_transfer creates new, empty cctx's */ 1565 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 1566
1557 Safefree (cctx); 1567 Safefree (cctx);
1558} 1568}
1559 1569
1560/* wether this cctx should be destructed */ 1570/* wether this cctx should be destructed */
… …
1579} 1589}
1580 1590
1581static void 1591static void
1582cctx_put (coro_cctx *cctx) 1592cctx_put (coro_cctx *cctx)
1583{ 1593{
1584 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1594 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1585 1595
1586 /* free another cctx if overlimit */ 1596 /* free another cctx if overlimit */
1587 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1597 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1588 { 1598 {
1589 coro_cctx *first = cctx_first; 1599 coro_cctx *first = cctx_first;
… …
1715 return; 1725 return;
1716 1726
1717 slf_destroy (aTHX_ coro); 1727 slf_destroy (aTHX_ coro);
1718 1728
1719 coro->flags |= CF_ZOMBIE; 1729 coro->flags |= CF_ZOMBIE;
1720 1730
1721 if (coro->flags & CF_READY) 1731 if (coro->flags & CF_READY)
1722 { 1732 {
1723 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1733 /* reduce nready, as destroying a ready coro effectively unreadies it */
1724 /* alternative: look through all ready queues and remove the coro */ 1734 /* alternative: look through all ready queues and remove the coro */
1725 --coro_nready; 1735 --coro_nready;
… …
1921 /* nothing to schedule: call the idle handler */ 1931 /* nothing to schedule: call the idle handler */
1922 if (SvROK (sv_idle) 1932 if (SvROK (sv_idle)
1923 && SvOBJECT (SvRV (sv_idle))) 1933 && SvOBJECT (SvRV (sv_idle)))
1924 { 1934 {
1925 if (SvRV (sv_idle) == SvRV (coro_current)) 1935 if (SvRV (sv_idle) == SvRV (coro_current))
1936 {
1937 require_pv ("Carp");
1938
1939 {
1940 dSP;
1941
1942 ENTER;
1943 SAVETMPS;
1944
1945 PUSHMARK (SP);
1926 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1946 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1947 PUTBACK;
1948 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1949
1950 FREETMPS;
1951 LEAVE;
1952 }
1953 }
1927 1954
1928 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1955 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1929 api_ready (aTHX_ SvRV (sv_idle)); 1956 api_ready (aTHX_ SvRV (sv_idle));
1930 --coro_nready; 1957 --coro_nready;
1931 } 1958 }
… …
2129 AV *od = coro->on_destroy; 2156 AV *od = coro->on_destroy;
2130 2157
2131 if (!od) 2158 if (!od)
2132 return; 2159 return;
2133 2160
2161 coro->on_destroy = 0;
2162 sv_2mortal ((SV *)od);
2163
2134 while (AvFILLp (od) >= 0) 2164 while (AvFILLp (od) >= 0)
2135 { 2165 {
2136 SV *cb = sv_2mortal (av_pop (od)); 2166 SV *cb = sv_2mortal (av_pop (od));
2137 2167
2138 /* coro hv's (and only hv's at the moment) are supported as well */ 2168 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2158 2188
2159static void 2189static void
2160coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2190coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2161{ 2191{
2162 AV *av; 2192 AV *av;
2163 2193
2164 if (coro->status) 2194 if (coro->status)
2165 { 2195 {
2166 av = coro->status; 2196 av = coro->status;
2167 av_clear (av); 2197 av_clear (av);
2168 } 2198 }
… …
2215 2245
2216 coro = SvSTATE (arg [0]); 2246 coro = SvSTATE (arg [0]);
2217 coro_hv = coro->hv; 2247 coro_hv = coro->hv;
2218 2248
2219 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2249 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2220 2250
2221 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2251 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2222 { 2252 {
2223 /* coro currently busy cancelling something, so just notify it */ 2253 /* coro currently busy cancelling something, so just notify it */
2224 coro->slf_frame.data = (void *)coro; 2254 coro->slf_frame.data = (void *)coro;
2225 2255
… …
2232 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2262 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2233 } 2263 }
2234 else 2264 else
2235 { 2265 {
2236 struct coro *self = SvSTATE_current; 2266 struct coro *self = SvSTATE_current;
2267
2268 if (!self)
2269 croak ("Coro::cancel called outside of thread content,");
2237 2270
2238 /* otherwise we cancel directly, purely for speed reasons 2271 /* otherwise we cancel directly, purely for speed reasons
2239 * unfortunately, this requires some magic trickery, as 2272 * unfortunately, this requires some magic trickery, as
2240 * somebody else could cancel us, so we have to fight the cancellation. 2273 * somebody else could cancel us, so we have to fight the cancellation.
2241 * this is ugly, and hopefully fully worth the extra speed. 2274 * this is ugly, and hopefully fully worth the extra speed.
… …
2404 2437
2405static int 2438static int
2406slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2439slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2407{ 2440{
2408 SV *data = (SV *)frame->data; 2441 SV *data = (SV *)frame->data;
2409 2442
2410 if (CORO_THROW) 2443 if (CORO_THROW)
2411 return 0; 2444 return 0;
2412 2445
2413 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2446 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2414 return 1; 2447 return 1;
… …
2450 cb = sv_2mortal (coro->rouse_cb); 2483 cb = sv_2mortal (coro->rouse_cb);
2451 coro->rouse_cb = 0; 2484 coro->rouse_cb = 0;
2452 } 2485 }
2453 2486
2454 if (!SvROK (cb) 2487 if (!SvROK (cb)
2455 || SvTYPE (SvRV (cb)) != SVt_PVCV 2488 || SvTYPE (SvRV (cb)) != SVt_PVCV
2456 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2489 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2457 croak ("Coro::rouse_wait called with illegal callback argument,"); 2490 croak ("Coro::rouse_wait called with illegal callback argument,");
2458 2491
2459 { 2492 {
2460 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2583 2616
2584/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2617/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2585static void 2618static void
2586slf_destroy (pTHX_ struct coro *coro) 2619slf_destroy (pTHX_ struct coro *coro)
2587{ 2620{
2588 /* this callback is reserved for slf functions needing to do cleanup */ 2621 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 2622
2592 /* 2623 /*
2593 * The on_destroy above most likely is from an SLF call. 2624 * The on_destroy below most likely is from an SLF call.
2594 * Since by definition the SLF call will not finish when we destroy 2625 * Since by definition the SLF call will not finish when we destroy
2595 * the coro, we will have to force-finish it here, otherwise 2626 * the coro, we will have to force-finish it here, otherwise
2596 * cleanup functions cannot call SLF functions. 2627 * cleanup functions cannot call SLF functions.
2597 */ 2628 */
2598 coro->slf_frame.prepare = 0; 2629 coro->slf_frame.prepare = 0;
2630
2631 /* this callback is reserved for slf functions needing to do cleanup */
2632 if (frame.destroy && frame.prepare && !PL_dirty)
2633 frame.destroy (aTHX_ &frame);
2599} 2634}
2600 2635
2601/* 2636/*
2602 * these not obviously related functions are all rolled into one 2637 * these not obviously related functions are all rolled into one
2603 * function to increase chances that they all will call transfer with the same 2638 * function to increase chances that they all will call transfer with the same
… …
2943{ 2978{
2944 AV *av = (AV *)frame->data; 2979 AV *av = (AV *)frame->data;
2945 SV *count_sv = AvARRAY (av)[0]; 2980 SV *count_sv = AvARRAY (av)[0];
2946 SV *coro_hv = SvRV (coro_current); 2981 SV *coro_hv = SvRV (coro_current);
2947 2982
2983 frame->destroy = 0;
2984
2948 /* if we are about to throw, don't actually acquire the lock, just throw */ 2985 /* if we are about to throw, don't actually acquire the lock, just throw */
2949 if (CORO_THROW) 2986 if (ecb_expect_false (CORO_THROW))
2987 {
2988 /* we still might be responsible for the semaphore, so wake up others */
2989 coro_semaphore_adjust (aTHX_ av, 0);
2990
2950 return 0; 2991 return 0;
2992 }
2951 else if (SvIVX (count_sv) > 0) 2993 else if (SvIVX (count_sv) > 0)
2952 { 2994 {
2953 frame->destroy = 0;
2954
2955 if (acquire) 2995 if (acquire)
2956 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2996 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2957 else 2997 else
2958 coro_semaphore_adjust (aTHX_ av, 0); 2998 coro_semaphore_adjust (aTHX_ av, 0);
2959 2999
… …
3181 /* it quickly returns */ 3221 /* it quickly returns */
3182 if (CORO_THROW) 3222 if (CORO_THROW)
3183 return 0; 3223 return 0;
3184 3224
3185 /* one element that is an RV? repeat! */ 3225 /* one element that is an RV? repeat! */
3186 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3226 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3187 return 1; 3227 return 1;
3188 3228
3189 /* restore status */ 3229 /* restore status */
3190 { 3230 {
3191 SV *data_sv = av_pop (state); 3231 SV *data_sv = av_pop (state);
… …
3381 int count; 3421 int count;
3382 3422
3383 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3423 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3384 3424
3385 PUSHMARK (SP); 3425 PUSHMARK (SP);
3386#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3426 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3387# include "state.h" 3427 #include "state.h"
3388#undef VARx
3389 count = call_pv ("Coro::State::_jit", G_ARRAY); 3428 count = call_pv ("Coro::State::_jit", G_ARRAY);
3390 SPAGAIN; 3429 SPAGAIN;
3391 3430
3392 save = POPs; save_ptr = SvPVbyte (save, save_len); 3431 save = POPs; save_ptr = SvPVbyte (save, save_len);
3393 load = POPs; load_ptr = SvPVbyte (load, load_len); 3432 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3420 3459
3421PROTOTYPES: DISABLE 3460PROTOTYPES: DISABLE
3422 3461
3423BOOT: 3462BOOT:
3424{ 3463{
3464#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3465#include "state.h"
3425#ifdef USE_ITHREADS 3466#ifdef USE_ITHREADS
3426# if CORO_PTHREAD 3467# if CORO_PTHREAD
3427 coro_thx = PERL_GET_CONTEXT; 3468 coro_thx = PERL_GET_CONTEXT;
3428# endif 3469# endif
3429#endif 3470#endif
3430 BOOT_PAGESIZE;
3431
3432 /* perl defines these to check for existance first, but why it doesn't */ 3471 /* 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 */ 3472 /* just create them one at init time is not clear to me, except for */
3434 /* programs trying to delete them, but... */ 3473 /* programs trying to delete them, but... */
3435 /* anyway, we declare this as invalid and make sure they are initialised here */ 3474 /* anyway, we declare this as invalid and make sure they are initialised here */
3436 DEFSV; 3475 DEFSV;
… …
3506void 3545void
3507transfer (...) 3546transfer (...)
3508 PROTOTYPE: $$ 3547 PROTOTYPE: $$
3509 CODE: 3548 CODE:
3510 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3549 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3511
3512void
3513_exit (int code)
3514 PROTOTYPE: $
3515 CODE:
3516 _exit (code);
3517 3550
3518SV * 3551SV *
3519clone (Coro::State coro) 3552clone (Coro::State coro)
3520 CODE: 3553 CODE:
3521{ 3554{
… …
3576void 3609void
3577list () 3610list ()
3578 PROTOTYPE: 3611 PROTOTYPE:
3579 PPCODE: 3612 PPCODE:
3580{ 3613{
3581 struct coro *coro; 3614 struct coro *coro;
3582 for (coro = coro_first; coro; coro = coro->next) 3615 for (coro = coro_first; coro; coro = coro->next)
3583 if (coro->hv) 3616 if (coro->hv)
3584 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3617 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3585} 3618}
3586 3619
… …
3650 RETVAL = boolSV (coro->flags & ix); 3683 RETVAL = boolSV (coro->flags & ix);
3651 OUTPUT: 3684 OUTPUT:
3652 RETVAL 3685 RETVAL
3653 3686
3654void 3687void
3655throw (Coro::State self, SV *exception = &PL_sv_undef) 3688throw (SV *self, SV *exception = &PL_sv_undef)
3656 PROTOTYPE: $;$ 3689 PROTOTYPE: $;$
3657 CODE: 3690 CODE:
3658{ 3691{
3692 struct coro *coro = SvSTATE (self);
3659 struct coro *current = SvSTATE_current; 3693 struct coro *current = SvSTATE_current;
3660 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3694 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3661 SvREFCNT_dec (*exceptionp); 3695 SvREFCNT_dec (*exceptionp);
3662 SvGETMAGIC (exception); 3696 SvGETMAGIC (exception);
3663 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3697 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3698
3699 api_ready (aTHX_ self);
3664} 3700}
3665 3701
3666void 3702void
3667api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3703api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3668 PROTOTYPE: $;$ 3704 PROTOTYPE: $;$
… …
3745 3781
3746void 3782void
3747times (Coro::State self) 3783times (Coro::State self)
3748 PPCODE: 3784 PPCODE:
3749{ 3785{
3750 struct coro *current = SvSTATE (coro_current); 3786 struct coro *current = SvSTATE (coro_current);
3751 3787
3752 if (ecb_expect_false (current == self)) 3788 if (ecb_expect_false (current == self))
3753 { 3789 {
3754 coro_times_update (); 3790 coro_times_update ();
3755 coro_times_add (SvSTATE (coro_current)); 3791 coro_times_add (SvSTATE (coro_current));
… …
3798 3834
3799 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3835 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); 3836 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); 3837 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 */ 3838 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3803 3839
3804 coro_stash = gv_stashpv ("Coro", TRUE); 3840 coro_stash = gv_stashpv ("Coro", TRUE);
3805 3841
3806 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3807 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3808 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4030 on_leave = 1 4066 on_leave = 1
4031 PROTOTYPE: & 4067 PROTOTYPE: &
4032 CODE: 4068 CODE:
4033{ 4069{
4034 struct coro *coro = SvSTATE_current; 4070 struct coro *coro = SvSTATE_current;
4035 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4071 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4036 4072
4037 block = s_get_cv_croak (block); 4073 block = s_get_cv_croak (block);
4038 4074
4039 if (!*avp) 4075 if (!*avp)
4040 *avp = newAV (); 4076 *avp = newAV ();
… …
4060 4096
4061SV * 4097SV *
4062new (SV *klass, SV *count = 0) 4098new (SV *klass, SV *count = 0)
4063 CODE: 4099 CODE:
4064{ 4100{
4065 int semcnt = 1; 4101 int semcnt = 1;
4066 4102
4067 if (count) 4103 if (count)
4068 { 4104 {
4069 SvGETMAGIC (count); 4105 SvGETMAGIC (count);
4070 4106
… …
4130 XSRETURN_NO; 4166 XSRETURN_NO;
4131} 4167}
4132 4168
4133void 4169void
4134waiters (SV *self) 4170waiters (SV *self)
4135 PPCODE: 4171 PPCODE:
4136{ 4172{
4137 AV *av = (AV *)SvRV (self); 4173 AV *av = (AV *)SvRV (self);
4138 int wcount = AvFILLp (av) + 1 - 1; 4174 int wcount = AvFILLp (av) + 1 - 1;
4139 4175
4140 if (GIMME_V == G_SCALAR) 4176 if (GIMME_V == G_SCALAR)
… …
4152 4188
4153void 4189void
4154_may_delete (SV *sem, int count, unsigned int extra_refs) 4190_may_delete (SV *sem, int count, unsigned int extra_refs)
4155 PPCODE: 4191 PPCODE:
4156{ 4192{
4157 AV *av = (AV *)SvRV (sem); 4193 AV *av = (AV *)SvRV (sem);
4158 4194
4159 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4195 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4160 && AvFILLp (av) == 0 /* no waiters, just count */ 4196 && AvFILLp (av) == 0 /* no waiters, just count */
4161 && SvIV (AvARRAY (av)[0]) == count) 4197 && SvIV (AvARRAY (av)[0]) == count)
4162 XSRETURN_YES; 4198 XSRETURN_YES;
… …
4183 4219
4184void 4220void
4185broadcast (SV *self) 4221broadcast (SV *self)
4186 CODE: 4222 CODE:
4187{ 4223{
4188 AV *av = (AV *)SvRV (self); 4224 AV *av = (AV *)SvRV (self);
4189 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4225 coro_signal_wake (aTHX_ av, AvFILLp (av));
4190} 4226}
4191 4227
4192void 4228void
4193send (SV *self) 4229send (SV *self)
… …
4201 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4237 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4202} 4238}
4203 4239
4204IV 4240IV
4205awaited (SV *self) 4241awaited (SV *self)
4206 CODE: 4242 CODE:
4207 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4243 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4208 OUTPUT: 4244 OUTPUT:
4209 RETVAL 4245 RETVAL
4210 4246
4211 4247
… …
4216 4252
4217void 4253void
4218_schedule (...) 4254_schedule (...)
4219 CODE: 4255 CODE:
4220{ 4256{
4221 static int incede; 4257 static int incede;
4222 4258
4223 api_cede_notself (aTHX); 4259 api_cede_notself (aTHX);
4224 4260
4225 ++incede; 4261 ++incede;
4226 while (coro_nready >= incede && api_cede (aTHX)) 4262 while (coro_nready >= incede && api_cede (aTHX))
… …
4270 { 4306 {
4271 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4307 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4272 coro_old_pp_sselect = 0; 4308 coro_old_pp_sselect = 0;
4273 } 4309 }
4274 4310
4311MODULE = Coro::State PACKAGE = Coro::Util
4312
4313void
4314_exit (int code)
4315 CODE:
4316 _exit (code);
4317
4318NV
4319time ()
4320 CODE:
4321 RETVAL = nvtime (aTHX);
4322 OUTPUT:
4323 RETVAL
4324
4325NV
4326gettimeofday ()
4327 PPCODE:
4328{
4329 UV tv [2];
4330 u2time (aTHX_ tv);
4331 EXTEND (SP, 2);
4332 PUSHs (sv_2mortal (newSVuv (tv [0])));
4333 PUSHs (sv_2mortal (newSVuv (tv [1])));
4334}
4335

Diff Legend

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