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.416 by root, Mon Dec 12 15:19:56 2011 UTC vs.
Revision 1.453 by root, Tue Jul 7 00:33:25 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
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
24#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
26#endif 66#endif
27 67
28#if defined(_WIN32) 68#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
30# undef setjmp 70# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
34#else 74#else
35# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
36#endif 76#endif
37 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
67 80
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 82# 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 83#endif
79 84
80/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
101# if CORO_PTHREAD 106# if CORO_PTHREAD
102static void *coro_thx; 107static void *coro_thx;
103# endif 108# endif
104#endif 109#endif
105 110
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux 111#ifdef __linux
110# include <time.h> /* for timespec */ 112# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */ 113# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime 114# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
176typedef struct coro_cctx 178typedef struct coro_cctx
177{ 179{
178 struct coro_cctx *next; 180 struct coro_cctx *next;
179 181
180 /* the stack */ 182 /* the stack */
181 void *sptr; 183 struct coro_stack stack;
182 size_t ssize;
183 184
184 /* cpu state */ 185 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG 187#ifndef NDEBUG
187 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
213}; 214};
214 215
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 216/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 217typedef struct
217{ 218{
218#define VARx(name,expr,type) type name; 219 #define VARx(name,expr,type) type name;
219# include "state.h" 220 #include "state.h"
220#undef VARx
221} perl_slots; 221} perl_slots;
222 222
223/* how many context stack entries do we need for perl_slots */ 223/* how many context stack entries do we need for perl_slots */
224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
225 225
… …
256 SV *saved_deffh; 256 SV *saved_deffh;
257 SV *invoke_cb; 257 SV *invoke_cb;
258 AV *invoke_av; 258 AV *invoke_av;
259 259
260 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
261 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
262 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
263 263
264 /* swap_sv */ 264 /* swap_sv */
265 AV *swap_sv; 265 AV *swap_sv;
266 266
267 /* times */ 267 /* times */
… …
297#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298 298
299/** JIT *********************************************************************/ 299/** JIT *********************************************************************/
300 300
301#if CORO_JIT 301#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */ 302 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE 304 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY 305 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix" 306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY 307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix" 308 #define CORO_JIT_TYPE "x86-unix"
309 #endif 309 #endif
310 #endif 310 #endif
311#endif 311#endif
312 312
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT 314 #undef CORO_JIT
315#endif 315#endif
316 316
317#if CORO_JIT 317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *); 318 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
375time_init (pTHX) 375time_init (pTHX)
376{ 376{
377 SV **svp; 377 SV **svp;
378 378
379 require_pv ("Time/HiRes.pm"); 379 require_pv ("Time/HiRes.pm");
380 380
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382 382
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385 385
… …
503 503
504 return 0; 504 return 0;
505} 505}
506 506
507ecb_inline struct coro * 507ecb_inline struct coro *
508SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro_sv)
509{ 509{
510 MAGIC *mg; 510 MAGIC *mg;
511 511
512 if (SvROK (coro)) 512 if (SvROK (coro_sv))
513 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
514 514
515 mg = SvSTATEhv_p (aTHX_ coro); 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
516 if (!mg) 516 if (!mg)
517 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
518 518
519 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
520} 520}
… …
526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
527 527
528/*****************************************************************************/ 528/*****************************************************************************/
529/* padlist management and caching */ 529/* padlist management and caching */
530 530
531ecb_inline AV * 531ecb_inline PADLIST *
532coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
533{ 533{
534 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
535 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
536 539
537 newpadlist = newAV (); 540#if NEWPADAPI
541
542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
554#if PERL_VERSION_ATLEAST (5,10,0)
555 Perl_pad_push (aTHX_ padlist, off);
556#else
557 Perl_pad_push (aTHX_ padlist, off, 1);
558#endif
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistMAX (padlist) = off - 1;
562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
538 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
541#else
542 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
543#endif 569#endif
544 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
545 --AvFILLp (padlist);
546 570
547 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 571 /* Already extended to 2 elements by newPADLIST. */
548 av_store (newpadlist, 1, (SV *)newpad); 572 PadlistMAX (newpadlist) = 1;
573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
578 PadlistARRAY (newpadlist)[1] = newpad;
549 579
550 return newpadlist; 580 return newpadlist;
551} 581}
552 582
553ecb_inline void 583ecb_inline void
554free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
555{ 585{
556 /* may be during global destruction */ 586 /* may be during global destruction */
557 if (!IN_DESTRUCT) 587 if (!IN_DESTRUCT)
558 { 588 {
559 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
560 590
561 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
562 { 592 {
563 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
564 AV *av = (AV *)AvARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
565 I32 j = AvFILLp (av);
566 595
596 if (pad)
597 {
598 I32 j = PadMAX (pad);
599
567 while (j >= 0) 600 while (j >= 0)
568 SvREFCNT_dec (AvARRAY (av)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
569 602
570 AvFILLp (av) = -1; 603 PadMAX (pad) = -1;
571 SvREFCNT_dec (av); 604 SvREFCNT_dec (pad);
605 }
572 } 606 }
573 607
574 SvREFCNT_dec (AvARRAY (padlist)[0]); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
575 609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
576 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
577 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
578 } 618 }
579} 619}
580 620
581static int 621static int
582coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
583{ 623{
584 AV *padlist; 624 PADLIST *padlist;
585 AV *av = (AV *)mg->mg_obj; 625 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
626 size_t len = *(size_t *)mg->mg_ptr;
586 627
587 /* perl manages to free our internal AV and _then_ call us */ 628 /* perl manages to free our internal AV and _then_ call us */
588 if (IN_DESTRUCT) 629 if (IN_DESTRUCT)
589 return 0; 630 return 0;
590 631
591 /* casting is fun. */ 632 while (len--)
592 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
593 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
594
595 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
596 634
597 return 0; 635 return 0;
598} 636}
599 637
600static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
… …
605/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
606ecb_inline void 644ecb_inline void
607get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
608{ 646{
609 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
610 AV *av; 648 size_t *lenp;
611 649
612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
614 else 652 else
615 { 653 {
616#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
617 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
618 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
… …
628 666
629ecb_inline void 667ecb_inline void
630put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
631{ 669{
632 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
633 AV *av;
634 671
635 if (ecb_expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 674 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
675 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
676 mg->mg_len = 1; /* so mg_free frees mg_ptr */
677 }
678 else
679 Renew (mg->mg_ptr,
680 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
681 char);
637 682
638 av = (AV *)mg->mg_obj; 683 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
639
640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
641 av_extend (av, AvFILLp (av) + 1);
642
643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
644} 684}
645 685
646/** load & save, init *******************************************************/ 686/** load & save, init *******************************************************/
647 687
648ecb_inline void 688ecb_inline void
… …
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670 710
671 /* if SvANY points to the head, we need to adjust the pointers, 711 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa. 712 * as the pointer for a still points to b, and maybe vice versa.
673 */ 713 */
674 #define svany_in_head(type) \ 714 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 715 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,20,0)
716 svany_in_head_set |= 1 << SVt_NV;
717 #endif
718
719 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
676 720
677 if (svany_in_head (SvTYPE (a))) 721 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 722 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679 723
680 if (svany_in_head (SvTYPE (b))) 724 if (svany_in_head (SvTYPE (b)))
… …
710 754
711#if CORO_JIT 755#if CORO_JIT
712 load_perl_slots (slot); 756 load_perl_slots (slot);
713#else 757#else
714 #define VARx(name,expr,type) expr = slot->name; 758 #define VARx(name,expr,type) expr = slot->name;
715 # include "state.h" 759 #include "state.h"
716 #undef VARx
717#endif 760#endif
718 761
719 { 762 {
720 dSP; 763 dSP;
721 764
… …
724 /* now do the ugly restore mess */ 767 /* now do the ugly restore mess */
725 while (ecb_expect_true (cv = (CV *)POPs)) 768 while (ecb_expect_true (cv = (CV *)POPs))
726 { 769 {
727 put_padlist (aTHX_ cv); /* mark this padlist as available */ 770 put_padlist (aTHX_ cv); /* mark this padlist as available */
728 CvDEPTH (cv) = PTR2IV (POPs); 771 CvDEPTH (cv) = PTR2IV (POPs);
729 CvPADLIST (cv) = (AV *)POPs; 772 CvPADLIST (cv) = (PADLIST *)POPs;
730 } 773 }
731 774
732 PUTBACK; 775 PUTBACK;
733 } 776 }
734 777
… …
749 792
750 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 793 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
752 } 795 }
753 796
797 if (ecb_expect_false (c->on_enter_xs))
798 {
799 int i;
800
801 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
802 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
803 }
804
754 SWAP_SVS (c); 805 SWAP_SVS (c);
755} 806}
756 807
757static void 808static void
758save_perl (pTHX_ Coro__State c) 809save_perl (pTHX_ Coro__State c)
759{ 810{
760 SWAP_SVS (c); 811 SWAP_SVS (c);
812
813 if (ecb_expect_false (c->on_leave_xs))
814 {
815 int i;
816
817 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
818 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
819 }
761 820
762 if (ecb_expect_false (c->on_leave)) 821 if (ecb_expect_false (c->on_leave))
763 { 822 {
764 int i; 823 int i;
765 824
… …
843 902
844#if CORO_JIT 903#if CORO_JIT
845 save_perl_slots (slot); 904 save_perl_slots (slot);
846#else 905#else
847 #define VARx(name,expr,type) slot->name = expr; 906 #define VARx(name,expr,type) slot->name = expr;
848 # include "state.h" 907 #include "state.h"
849 #undef VARx
850#endif 908#endif
851 } 909 }
852} 910}
853 911
854/* 912/*
… …
998 { 1056 {
999 SV **svp = 0; 1057 SV **svp = 0;
1000 1058
1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1059 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1060 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1003 1061
1004 if (svp) 1062 if (svp)
1005 { 1063 {
1006 SV *ssv; 1064 SV *ssv;
1007 1065
1008 if (!*svp) 1066 if (!*svp)
… …
1114 PL_hints = 0; 1172 PL_hints = 0;
1115 1173
1116 /* recreate the die/warn hooks */ 1174 /* recreate the die/warn hooks */
1117 PL_diehook = SvREFCNT_inc (rv_diehook); 1175 PL_diehook = SvREFCNT_inc (rv_diehook);
1118 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1176 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1119 1177
1120 GvSV (PL_defgv) = newSV (0); 1178 GvSV (PL_defgv) = newSV (0);
1121 GvAV (PL_defgv) = coro->args; coro->args = 0; 1179 GvAV (PL_defgv) = coro->args; coro->args = 0;
1122 GvSV (PL_errgv) = newSV (0); 1180 GvSV (PL_errgv) = newSV (0);
1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1181 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1124 GvHV (PL_hintgv) = 0; 1182 GvHV (PL_hintgv) = newHV ();
1183#if PERL_VERSION_ATLEAST (5,10,0)
1184 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1185#endif
1125 PL_rs = newSVsv (GvSV (irsgv)); 1186 PL_rs = newSVsv (GvSV (irsgv));
1126 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1187 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1127 1188
1128 { 1189 {
1129 dSP; 1190 dSP;
… …
1239 1300
1240 SvREFCNT_dec (coro->saved_deffh); 1301 SvREFCNT_dec (coro->saved_deffh);
1241 SvREFCNT_dec (coro->rouse_cb); 1302 SvREFCNT_dec (coro->rouse_cb);
1242 SvREFCNT_dec (coro->invoke_cb); 1303 SvREFCNT_dec (coro->invoke_cb);
1243 SvREFCNT_dec (coro->invoke_av); 1304 SvREFCNT_dec (coro->invoke_av);
1305 SvREFCNT_dec (coro->on_enter_xs);
1306 SvREFCNT_dec (coro->on_leave_xs);
1244 } 1307 }
1245} 1308}
1246 1309
1247ecb_inline void 1310ecb_inline void
1248free_coro_mortal (pTHX) 1311free_coro_mortal (pTHX)
… …
1311 1374
1312 if (PL_curcop != &PL_compiling) 1375 if (PL_curcop != &PL_compiling)
1313 { 1376 {
1314 SV **cb; 1377 SV **cb;
1315 1378
1316 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1379 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1317 { 1380 {
1318 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1381 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1319 1382
1320 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1383 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1321 { 1384 {
… …
1417transfer_tail (pTHX) 1480transfer_tail (pTHX)
1418{ 1481{
1419 free_coro_mortal (aTHX); 1482 free_coro_mortal (aTHX);
1420} 1483}
1421 1484
1485/* try to exit the same way perl's main function would do */
1486/* we do not bother resetting the environment or other things *7
1487/* that are not, uhm, essential */
1488/* this obviously also doesn't work when perl is embedded */
1489static void ecb_noinline ecb_cold
1490perlish_exit (pTHX)
1491{
1492 int exitstatus = perl_destruct (PL_curinterp);
1493 perl_free (PL_curinterp);
1494 exit (exitstatus);
1495}
1496
1422/* 1497/*
1423 * this is a _very_ stripped down perl interpreter ;) 1498 * this is a _very_ stripped down perl interpreter ;)
1424 */ 1499 */
1425static void 1500static void
1426cctx_run (void *arg) 1501cctx_run (void *arg)
… …
1453 */ 1528 */
1454 1529
1455 /* 1530 /*
1456 * If perl-run returns we assume exit() was being called or the coro 1531 * If perl-run returns we assume exit() was being called or the coro
1457 * fell off the end, which seems to be the only valid (non-bug) 1532 * fell off the end, which seems to be the only valid (non-bug)
1458 * reason for perl_run to return. We try to exit by jumping to the 1533 * reason for perl_run to return. We try to mimic whatever perl is normally
1459 * bootstrap-time "top" top_env, as we cannot restore the "main" 1534 * doing in that case. YMMV.
1460 * coroutine as Coro has no such concept.
1461 * This actually isn't valid with the pthread backend, but OSes requiring
1462 * that backend are too broken to do it in a standards-compliant way.
1463 */ 1535 */
1464 PL_top_env = main_top_env; 1536 perlish_exit (aTHX);
1465 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1466 } 1537 }
1467} 1538}
1468 1539
1469static coro_cctx * 1540static coro_cctx *
1470cctx_new (void) 1541cctx_new (void)
… …
1485static coro_cctx * 1556static coro_cctx *
1486cctx_new_empty (void) 1557cctx_new_empty (void)
1487{ 1558{
1488 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1489 1560
1490 cctx->sptr = 0; 1561 cctx->stack.sptr = 0;
1491 coro_create (&cctx->cctx, 0, 0, 0, 0); 1562 coro_create (&cctx->cctx, 0, 0, 0, 0);
1492 1563
1493 return cctx; 1564 return cctx;
1494} 1565}
1495 1566
1496/* create a new cctx suitable as destination/running a perl interpreter */ 1567/* create a new cctx suitable as destination/running a perl interpreter */
1497static coro_cctx * 1568static coro_cctx *
1498cctx_new_run (void) 1569cctx_new_run (void)
1499{ 1570{
1500 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1501 void *stack_start;
1502 size_t stack_size;
1503 1572
1504#if HAVE_MMAP 1573 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1505 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1506 /* mmap supposedly does allocate-on-write for us */
1507 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1508
1509 if (cctx->sptr != (void *)-1)
1510 {
1511 #if CORO_STACKGUARD
1512 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1513 #endif
1514 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1515 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1516 cctx->flags |= CC_MAPPED;
1517 } 1574 {
1518 else
1519#endif
1520 {
1521 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1522 New (0, cctx->sptr, cctx_stacksize, long);
1523
1524 if (!cctx->sptr)
1525 {
1526 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1575 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1527 _exit (EXIT_FAILURE); 1576 _exit (EXIT_FAILURE);
1528 }
1529
1530 stack_start = cctx->sptr;
1531 stack_size = cctx->ssize;
1532 } 1577 }
1533 1578
1534 #if CORO_USE_VALGRIND
1535 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1536 #endif
1537
1538 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1579 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1539 1580
1540 return cctx; 1581 return cctx;
1541} 1582}
1542 1583
1543static void 1584static void
… …
1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1590 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1550 1591
1551 --cctx_count; 1592 --cctx_count;
1552 coro_destroy (&cctx->cctx); 1593 coro_destroy (&cctx->cctx);
1553 1594
1554 /* coro_transfer creates new, empty cctx's */ 1595 coro_stack_free (&cctx->stack);
1555 if (cctx->sptr)
1556 {
1557 #if CORO_USE_VALGRIND
1558 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1559 #endif
1560
1561#if HAVE_MMAP
1562 if (cctx->flags & CC_MAPPED)
1563 munmap (cctx->sptr, cctx->ssize);
1564 else
1565#endif
1566 Safefree (cctx->sptr);
1567 }
1568 1596
1569 Safefree (cctx); 1597 Safefree (cctx);
1570} 1598}
1571 1599
1572/* wether this cctx should be destructed */ 1600/* wether this cctx should be destructed */
… …
1591} 1619}
1592 1620
1593static void 1621static void
1594cctx_put (coro_cctx *cctx) 1622cctx_put (coro_cctx *cctx)
1595{ 1623{
1596 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1624 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1597 1625
1598 /* free another cctx if overlimit */ 1626 /* free another cctx if overlimit */
1599 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1627 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1600 { 1628 {
1601 coro_cctx *first = cctx_first; 1629 coro_cctx *first = cctx_first;
… …
1727 return; 1755 return;
1728 1756
1729 slf_destroy (aTHX_ coro); 1757 slf_destroy (aTHX_ coro);
1730 1758
1731 coro->flags |= CF_ZOMBIE; 1759 coro->flags |= CF_ZOMBIE;
1732 1760
1733 if (coro->flags & CF_READY) 1761 if (coro->flags & CF_READY)
1734 { 1762 {
1735 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1763 /* reduce nready, as destroying a ready coro effectively unreadies it */
1736 /* alternative: look through all ready queues and remove the coro */ 1764 /* alternative: look through all ready queues and remove the coro */
1737 --coro_nready; 1765 --coro_nready;
… …
1933 /* nothing to schedule: call the idle handler */ 1961 /* nothing to schedule: call the idle handler */
1934 if (SvROK (sv_idle) 1962 if (SvROK (sv_idle)
1935 && SvOBJECT (SvRV (sv_idle))) 1963 && SvOBJECT (SvRV (sv_idle)))
1936 { 1964 {
1937 if (SvRV (sv_idle) == SvRV (coro_current)) 1965 if (SvRV (sv_idle) == SvRV (coro_current))
1966 {
1967 require_pv ("Carp");
1968
1969 {
1970 dSP;
1971
1972 ENTER;
1973 SAVETMPS;
1974
1975 PUSHMARK (SP);
1938 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1976 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1977 PUTBACK;
1978 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1979
1980 FREETMPS;
1981 LEAVE;
1982 }
1983 }
1939 1984
1940 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1985 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1941 api_ready (aTHX_ SvRV (sv_idle)); 1986 api_ready (aTHX_ SvRV (sv_idle));
1942 --coro_nready; 1987 --coro_nready;
1943 } 1988 }
… …
2141 AV *od = coro->on_destroy; 2186 AV *od = coro->on_destroy;
2142 2187
2143 if (!od) 2188 if (!od)
2144 return; 2189 return;
2145 2190
2191 coro->on_destroy = 0;
2192 sv_2mortal ((SV *)od);
2193
2146 while (AvFILLp (od) >= 0) 2194 while (AvFILLp (od) >= 0)
2147 { 2195 {
2148 SV *cb = sv_2mortal (av_pop (od)); 2196 SV *cb = sv_2mortal (av_pop (od));
2149 2197
2150 /* coro hv's (and only hv's at the moment) are supported as well */ 2198 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2170 2218
2171static void 2219static void
2172coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2220coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2173{ 2221{
2174 AV *av; 2222 AV *av;
2175 2223
2176 if (coro->status) 2224 if (coro->status)
2177 { 2225 {
2178 av = coro->status; 2226 av = coro->status;
2179 av_clear (av); 2227 av_clear (av);
2180 } 2228 }
… …
2227 2275
2228 coro = SvSTATE (arg [0]); 2276 coro = SvSTATE (arg [0]);
2229 coro_hv = coro->hv; 2277 coro_hv = coro->hv;
2230 2278
2231 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2279 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2232 2280
2233 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2281 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2234 { 2282 {
2235 /* coro currently busy cancelling something, so just notify it */ 2283 /* coro currently busy cancelling something, so just notify it */
2236 coro->slf_frame.data = (void *)coro; 2284 coro->slf_frame.data = (void *)coro;
2237 2285
… …
2244 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2292 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2245 } 2293 }
2246 else 2294 else
2247 { 2295 {
2248 struct coro *self = SvSTATE_current; 2296 struct coro *self = SvSTATE_current;
2297
2298 if (!self)
2299 croak ("Coro::cancel called outside of thread content,");
2249 2300
2250 /* otherwise we cancel directly, purely for speed reasons 2301 /* otherwise we cancel directly, purely for speed reasons
2251 * unfortunately, this requires some magic trickery, as 2302 * unfortunately, this requires some magic trickery, as
2252 * somebody else could cancel us, so we have to fight the cancellation. 2303 * somebody else could cancel us, so we have to fight the cancellation.
2253 * this is ugly, and hopefully fully worth the extra speed. 2304 * this is ugly, and hopefully fully worth the extra speed.
… …
2416 2467
2417static int 2468static int
2418slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2469slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2419{ 2470{
2420 SV *data = (SV *)frame->data; 2471 SV *data = (SV *)frame->data;
2421 2472
2422 if (CORO_THROW) 2473 if (CORO_THROW)
2423 return 0; 2474 return 0;
2424 2475
2425 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2476 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2426 return 1; 2477 return 1;
… …
2462 cb = sv_2mortal (coro->rouse_cb); 2513 cb = sv_2mortal (coro->rouse_cb);
2463 coro->rouse_cb = 0; 2514 coro->rouse_cb = 0;
2464 } 2515 }
2465 2516
2466 if (!SvROK (cb) 2517 if (!SvROK (cb)
2467 || SvTYPE (SvRV (cb)) != SVt_PVCV 2518 || SvTYPE (SvRV (cb)) != SVt_PVCV
2468 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2519 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2469 croak ("Coro::rouse_wait called with illegal callback argument,"); 2520 croak ("Coro::rouse_wait called with illegal callback argument,");
2470 2521
2471 { 2522 {
2472 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2523 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2595 2646
2596/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2647/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2597static void 2648static void
2598slf_destroy (pTHX_ struct coro *coro) 2649slf_destroy (pTHX_ struct coro *coro)
2599{ 2650{
2600 /* this callback is reserved for slf functions needing to do cleanup */ 2651 struct CoroSLF frame = coro->slf_frame;
2601 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2602 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2603 2652
2604 /* 2653 /*
2605 * The on_destroy above most likely is from an SLF call. 2654 * The on_destroy below most likely is from an SLF call.
2606 * Since by definition the SLF call will not finish when we destroy 2655 * Since by definition the SLF call will not finish when we destroy
2607 * the coro, we will have to force-finish it here, otherwise 2656 * the coro, we will have to force-finish it here, otherwise
2608 * cleanup functions cannot call SLF functions. 2657 * cleanup functions cannot call SLF functions.
2609 */ 2658 */
2610 coro->slf_frame.prepare = 0; 2659 coro->slf_frame.prepare = 0;
2660
2661 /* this callback is reserved for slf functions needing to do cleanup */
2662 if (frame.destroy && frame.prepare && !PL_dirty)
2663 frame.destroy (aTHX_ &frame);
2611} 2664}
2612 2665
2613/* 2666/*
2614 * these not obviously related functions are all rolled into one 2667 * these not obviously related functions are all rolled into one
2615 * function to increase chances that they all will call transfer with the same 2668 * function to increase chances that they all will call transfer with the same
… …
2798static void 2851static void
2799coro_pop_on_leave (pTHX_ void *coro) 2852coro_pop_on_leave (pTHX_ void *coro)
2800{ 2853{
2801 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2854 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2802 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2855 on_enterleave_call (aTHX_ sv_2mortal (cb));
2856}
2857
2858static void
2859enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2860{
2861 if (!hook)
2862 return;
2863
2864 if (!*avp)
2865 {
2866 *avp = newAV ();
2867 AvREAL_off (*avp);
2868 }
2869
2870 av_push (*avp, (SV *)hook);
2871 av_push (*avp, (SV *)arg);
2872}
2873
2874static void
2875enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2876{
2877 AV *av = *avp;
2878 int i;
2879
2880 if (!av)
2881 return;
2882
2883 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2884 if (AvARRAY (av)[i] == (SV *)hook)
2885 {
2886 if (execute)
2887 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2888
2889 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2890 av_pop (av);
2891 av_pop (av);
2892 break;
2893 }
2894
2895 if (AvFILLp (av) >= 0)
2896 {
2897 *avp = 0;
2898 SvREFCNT_dec_NN (av);
2899 }
2900}
2901
2902static void
2903api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2904{
2905 struct coro *coro = SvSTATE (coro_sv);
2906
2907 if (SvSTATE_current == coro)
2908 if (enter)
2909 enter (aTHX_ enter_arg);
2910
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2912 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2913}
2914
2915static void
2916api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2917{
2918 struct coro *coro = SvSTATE (coro_sv);
2919
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2921 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2922}
2923
2924static void
2925savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2926{
2927 struct coro *coro = SvSTATE_current;
2928
2929 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2930}
2931
2932static void
2933savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2934{
2935 struct coro *coro = SvSTATE_current;
2936
2937 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2938}
2939
2940static void
2941api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2942{
2943 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2944
2945 /* this ought to be much cheaper than malloc + a single destructor call */
2946 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2947 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2803} 2948}
2804 2949
2805/*****************************************************************************/ 2950/*****************************************************************************/
2806/* PerlIO::cede */ 2951/* PerlIO::cede */
2807 2952
… …
2937 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3082 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2938 PUTBACK; 3083 PUTBACK;
2939 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3084 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2940 } 3085 }
2941 3086
2942 SvREFCNT_dec (cb); 3087 SvREFCNT_dec_NN (cb);
2943 } 3088 }
2944} 3089}
2945 3090
2946static void 3091static void
2947coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3092coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2955{ 3100{
2956 AV *av = (AV *)frame->data; 3101 AV *av = (AV *)frame->data;
2957 SV *count_sv = AvARRAY (av)[0]; 3102 SV *count_sv = AvARRAY (av)[0];
2958 SV *coro_hv = SvRV (coro_current); 3103 SV *coro_hv = SvRV (coro_current);
2959 3104
3105 frame->destroy = 0;
3106
2960 /* if we are about to throw, don't actually acquire the lock, just throw */ 3107 /* if we are about to throw, don't actually acquire the lock, just throw */
2961 if (CORO_THROW) 3108 if (ecb_expect_false (CORO_THROW))
3109 {
3110 /* we still might be responsible for the semaphore, so wake up others */
3111 coro_semaphore_adjust (aTHX_ av, 0);
3112
2962 return 0; 3113 return 0;
3114 }
2963 else if (SvIVX (count_sv) > 0) 3115 else if (SvIVX (count_sv) > 0)
2964 { 3116 {
2965 frame->destroy = 0;
2966
2967 if (acquire) 3117 if (acquire)
2968 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3118 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2969 else 3119 else
2970 coro_semaphore_adjust (aTHX_ av, 0); 3120 coro_semaphore_adjust (aTHX_ av, 0);
2971 3121
… …
3082 { 3232 {
3083 api_ready (aTHX_ cb); 3233 api_ready (aTHX_ cb);
3084 sv_setiv (cb, 0); /* signal waiter */ 3234 sv_setiv (cb, 0); /* signal waiter */
3085 } 3235 }
3086 3236
3087 SvREFCNT_dec (cb); 3237 SvREFCNT_dec_NN (cb);
3088 3238
3089 --count; 3239 --count;
3090 } 3240 }
3091} 3241}
3092 3242
… …
3177 } 3327 }
3178 3328
3179 av_push (state, data_sv); 3329 av_push (state, data_sv);
3180 3330
3181 api_ready (aTHX_ coro); 3331 api_ready (aTHX_ coro);
3182 SvREFCNT_dec (coro); 3332 SvREFCNT_dec_NN (coro);
3183 SvREFCNT_dec ((AV *)state); 3333 SvREFCNT_dec_NN ((AV *)state);
3184} 3334}
3185 3335
3186static int 3336static int
3187slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3337slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3188{ 3338{
… …
3193 /* it quickly returns */ 3343 /* it quickly returns */
3194 if (CORO_THROW) 3344 if (CORO_THROW)
3195 return 0; 3345 return 0;
3196 3346
3197 /* one element that is an RV? repeat! */ 3347 /* one element that is an RV? repeat! */
3198 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3348 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3199 return 1; 3349 return 1;
3200 3350
3201 /* restore status */ 3351 /* restore status */
3202 { 3352 {
3203 SV *data_sv = av_pop (state); 3353 SV *data_sv = av_pop (state);
… …
3206 errno = data->errorno; 3356 errno = data->errorno;
3207 PL_laststype = data->laststype; 3357 PL_laststype = data->laststype;
3208 PL_laststatval = data->laststatval; 3358 PL_laststatval = data->laststatval;
3209 PL_statcache = data->statcache; 3359 PL_statcache = data->statcache;
3210 3360
3211 SvREFCNT_dec (data_sv); 3361 SvREFCNT_dec_NN (data_sv);
3212 } 3362 }
3213 3363
3214 /* push result values */ 3364 /* push result values */
3215 { 3365 {
3216 dSP; 3366 dSP;
… …
3393 int count; 3543 int count;
3394 3544
3395 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3545 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3396 3546
3397 PUSHMARK (SP); 3547 PUSHMARK (SP);
3398#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3548 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3399# include "state.h" 3549 #include "state.h"
3400#undef VARx
3401 count = call_pv ("Coro::State::_jit", G_ARRAY); 3550 count = call_pv ("Coro::State::_jit", G_ARRAY);
3402 SPAGAIN; 3551 SPAGAIN;
3403 3552
3404 save = POPs; save_ptr = SvPVbyte (save, save_len); 3553 save = POPs; save_ptr = SvPVbyte (save, save_len);
3405 load = POPs; load_ptr = SvPVbyte (load, load_len); 3554 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3432 3581
3433PROTOTYPES: DISABLE 3582PROTOTYPES: DISABLE
3434 3583
3435BOOT: 3584BOOT:
3436{ 3585{
3586#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3587#include "state.h"
3437#ifdef USE_ITHREADS 3588#ifdef USE_ITHREADS
3438# if CORO_PTHREAD 3589# if CORO_PTHREAD
3439 coro_thx = PERL_GET_CONTEXT; 3590 coro_thx = PERL_GET_CONTEXT;
3440# endif 3591# endif
3441#endif 3592#endif
3442 BOOT_PAGESIZE;
3443
3444 /* perl defines these to check for existance first, but why it doesn't */ 3593 /* perl defines these to check for existance first, but why it doesn't */
3445 /* just create them one at init time is not clear to me, except for */ 3594 /* just create them one at init time is not clear to me, except for */
3446 /* programs trying to delete them, but... */ 3595 /* programs trying to delete them, but... */
3447 /* anyway, we declare this as invalid and make sure they are initialised here */ 3596 /* anyway, we declare this as invalid and make sure they are initialised here */
3448 DEFSV; 3597 DEFSV;
… …
3518void 3667void
3519transfer (...) 3668transfer (...)
3520 PROTOTYPE: $$ 3669 PROTOTYPE: $$
3521 CODE: 3670 CODE:
3522 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3671 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3523
3524void
3525_exit (int code)
3526 PROTOTYPE: $
3527 CODE:
3528 _exit (code);
3529 3672
3530SV * 3673SV *
3531clone (Coro::State coro) 3674clone (Coro::State coro)
3532 CODE: 3675 CODE:
3533{ 3676{
… …
3588void 3731void
3589list () 3732list ()
3590 PROTOTYPE: 3733 PROTOTYPE:
3591 PPCODE: 3734 PPCODE:
3592{ 3735{
3593 struct coro *coro; 3736 struct coro *coro;
3594 for (coro = coro_first; coro; coro = coro->next) 3737 for (coro = coro_first; coro; coro = coro->next)
3595 if (coro->hv) 3738 if (coro->hv)
3596 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3739 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3597} 3740}
3598 3741
… …
3662 RETVAL = boolSV (coro->flags & ix); 3805 RETVAL = boolSV (coro->flags & ix);
3663 OUTPUT: 3806 OUTPUT:
3664 RETVAL 3807 RETVAL
3665 3808
3666void 3809void
3667throw (Coro::State self, SV *exception = &PL_sv_undef) 3810throw (SV *self, SV *exception = &PL_sv_undef)
3668 PROTOTYPE: $;$ 3811 PROTOTYPE: $;$
3669 CODE: 3812 CODE:
3670{ 3813{
3814 struct coro *coro = SvSTATE (self);
3671 struct coro *current = SvSTATE_current; 3815 struct coro *current = SvSTATE_current;
3672 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3816 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3673 SvREFCNT_dec (*exceptionp); 3817 SvREFCNT_dec (*exceptionp);
3674 SvGETMAGIC (exception); 3818 SvGETMAGIC (exception);
3675 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3819 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3820
3821 api_ready (aTHX_ self);
3676} 3822}
3677 3823
3678void 3824void
3679api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3825api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3680 PROTOTYPE: $;$ 3826 PROTOTYPE: $;$
… …
3757 3903
3758void 3904void
3759times (Coro::State self) 3905times (Coro::State self)
3760 PPCODE: 3906 PPCODE:
3761{ 3907{
3762 struct coro *current = SvSTATE (coro_current); 3908 struct coro *current = SvSTATE (coro_current);
3763 3909
3764 if (ecb_expect_false (current == self)) 3910 if (ecb_expect_false (current == self))
3765 { 3911 {
3766 coro_times_update (); 3912 coro_times_update ();
3767 coro_times_add (SvSTATE (coro_current)); 3913 coro_times_add (SvSTATE (coro_current));
… …
3797 3943
3798MODULE = Coro::State PACKAGE = Coro 3944MODULE = Coro::State PACKAGE = Coro
3799 3945
3800BOOT: 3946BOOT:
3801{ 3947{
3948 if (SVt_LAST > 32)
3949 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3950
3802 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3951 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3803 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3952 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3804 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3953 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3805 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3954 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3806 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3810 3959
3811 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3960 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3812 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3961 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3813 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3962 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3814 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3963 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3815 3964
3816 coro_stash = gv_stashpv ("Coro", TRUE); 3965 coro_stash = gv_stashpv ("Coro", TRUE);
3817 3966
3818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3967 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3968 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3820 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3969 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3832 coroapi.ready = api_ready; 3981 coroapi.ready = api_ready;
3833 coroapi.is_ready = api_is_ready; 3982 coroapi.is_ready = api_is_ready;
3834 coroapi.nready = coro_nready; 3983 coroapi.nready = coro_nready;
3835 coroapi.current = coro_current; 3984 coroapi.current = coro_current;
3836 3985
3986 coroapi.enterleave_hook = api_enterleave_hook;
3987 coroapi.enterleave_unhook = api_enterleave_unhook;
3988 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3989
3837 /*GCoroAPI = &coroapi;*/ 3990 /*GCoroAPI = &coroapi;*/
3838 sv_setiv (sv, (IV)&coroapi); 3991 sv_setiv (sv, (IV)&coroapi);
3839 SvREADONLY_on (sv); 3992 SvREADONLY_on (sv);
3840 } 3993 }
3841} 3994}
… …
3906 4059
3907void 4060void
3908_set_current (SV *current) 4061_set_current (SV *current)
3909 PROTOTYPE: $ 4062 PROTOTYPE: $
3910 CODE: 4063 CODE:
3911 SvREFCNT_dec (SvRV (coro_current)); 4064 SvREFCNT_dec_NN (SvRV (coro_current));
3912 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4065 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3913 4066
3914void 4067void
3915_set_readyhook (SV *hook) 4068_set_readyhook (SV *hook)
3916 PROTOTYPE: $ 4069 PROTOTYPE: $
… …
4000 4153
4001 if ((SV *)hv == &PL_sv_undef) 4154 if ((SV *)hv == &PL_sv_undef)
4002 { 4155 {
4003 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4156 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4004 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4157 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4005 SvREFCNT_dec (sv); 4158 SvREFCNT_dec_NN (sv);
4006 } 4159 }
4007 4160
4008 { 4161 {
4009 struct coro *coro = SvSTATE_hv (hv); 4162 struct coro *coro = SvSTATE_hv (hv);
4010 4163
… …
4017 api_ready (aTHX_ (SV *)hv); 4170 api_ready (aTHX_ (SV *)hv);
4018 4171
4019 if (GIMME_V != G_VOID) 4172 if (GIMME_V != G_VOID)
4020 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4173 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4021 else 4174 else
4022 SvREFCNT_dec (hv); 4175 SvREFCNT_dec_NN (hv);
4023} 4176}
4024 4177
4025SV * 4178SV *
4026rouse_cb () 4179rouse_cb ()
4027 PROTOTYPE: 4180 PROTOTYPE:
… …
4042 on_leave = 1 4195 on_leave = 1
4043 PROTOTYPE: & 4196 PROTOTYPE: &
4044 CODE: 4197 CODE:
4045{ 4198{
4046 struct coro *coro = SvSTATE_current; 4199 struct coro *coro = SvSTATE_current;
4047 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4200 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4048 4201
4049 block = s_get_cv_croak (block); 4202 block = s_get_cv_croak (block);
4050 4203
4051 if (!*avp) 4204 if (!*avp)
4052 *avp = newAV (); 4205 *avp = newAV ();
… …
4072 4225
4073SV * 4226SV *
4074new (SV *klass, SV *count = 0) 4227new (SV *klass, SV *count = 0)
4075 CODE: 4228 CODE:
4076{ 4229{
4077 int semcnt = 1; 4230 int semcnt = 1;
4078 4231
4079 if (count) 4232 if (count)
4080 { 4233 {
4081 SvGETMAGIC (count); 4234 SvGETMAGIC (count);
4082 4235
… …
4142 XSRETURN_NO; 4295 XSRETURN_NO;
4143} 4296}
4144 4297
4145void 4298void
4146waiters (SV *self) 4299waiters (SV *self)
4147 PPCODE: 4300 PPCODE:
4148{ 4301{
4149 AV *av = (AV *)SvRV (self); 4302 AV *av = (AV *)SvRV (self);
4150 int wcount = AvFILLp (av) + 1 - 1; 4303 int wcount = AvFILLp (av) + 1 - 1;
4151 4304
4152 if (GIMME_V == G_SCALAR) 4305 if (GIMME_V == G_SCALAR)
… …
4164 4317
4165void 4318void
4166_may_delete (SV *sem, int count, unsigned int extra_refs) 4319_may_delete (SV *sem, int count, unsigned int extra_refs)
4167 PPCODE: 4320 PPCODE:
4168{ 4321{
4169 AV *av = (AV *)SvRV (sem); 4322 AV *av = (AV *)SvRV (sem);
4170 4323
4171 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4324 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4172 && AvFILLp (av) == 0 /* no waiters, just count */ 4325 && AvFILLp (av) == 0 /* no waiters, just count */
4173 && SvIV (AvARRAY (av)[0]) == count) 4326 && SvIV (AvARRAY (av)[0]) == count)
4174 XSRETURN_YES; 4327 XSRETURN_YES;
… …
4195 4348
4196void 4349void
4197broadcast (SV *self) 4350broadcast (SV *self)
4198 CODE: 4351 CODE:
4199{ 4352{
4200 AV *av = (AV *)SvRV (self); 4353 AV *av = (AV *)SvRV (self);
4201 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4354 coro_signal_wake (aTHX_ av, AvFILLp (av));
4202} 4355}
4203 4356
4204void 4357void
4205send (SV *self) 4358send (SV *self)
… …
4213 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4366 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4214} 4367}
4215 4368
4216IV 4369IV
4217awaited (SV *self) 4370awaited (SV *self)
4218 CODE: 4371 CODE:
4219 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4372 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4220 OUTPUT: 4373 OUTPUT:
4221 RETVAL 4374 RETVAL
4222 4375
4223 4376
… …
4228 4381
4229void 4382void
4230_schedule (...) 4383_schedule (...)
4231 CODE: 4384 CODE:
4232{ 4385{
4233 static int incede; 4386 static int incede;
4234 4387
4235 api_cede_notself (aTHX); 4388 api_cede_notself (aTHX);
4236 4389
4237 ++incede; 4390 ++incede;
4238 while (coro_nready >= incede && api_cede (aTHX)) 4391 while (coro_nready >= incede && api_cede (aTHX))
… …
4282 { 4435 {
4283 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4436 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4284 coro_old_pp_sselect = 0; 4437 coro_old_pp_sselect = 0;
4285 } 4438 }
4286 4439
4440MODULE = Coro::State PACKAGE = Coro::Util
4441
4442void
4443_exit (int code)
4444 CODE:
4445 _exit (code);
4446
4447NV
4448time ()
4449 CODE:
4450 RETVAL = nvtime (aTHX);
4451 OUTPUT:
4452 RETVAL
4453
4454NV
4455gettimeofday ()
4456 PPCODE:
4457{
4458 UV tv [2];
4459 u2time (aTHX_ tv);
4460 EXTEND (SP, 2);
4461 PUSHs (sv_2mortal (newSVuv (tv [0])));
4462 PUSHs (sv_2mortal (newSVuv (tv [1])));
4463}
4464

Diff Legend

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