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.423 by root, Mon Oct 8 23:13:36 2012 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
… …
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1 18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
19#include "ecb.h" 20#include "ecb.h"
20 21
21#include <stddef.h> 22#include <stddef.h>
22#include <stdio.h> 23#include <stdio.h>
23#include <errno.h> 24#include <errno.h>
24#include <assert.h> 25#include <assert.h>
25 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
26#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
27# 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
28#endif 66#endif
29 67
30#if defined(_WIN32) 68#if defined(_WIN32)
31# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
32# undef setjmp 70# undef setjmp
… …
35# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
36#else 74#else
37# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
38#endif 76#endif
39 77
40#if HAVE_MMAP
41# include <unistd.h>
42# include <sys/mman.h>
43# ifndef MAP_ANONYMOUS
44# ifdef MAP_ANON
45# define MAP_ANONYMOUS MAP_ANON
46# else
47# undef HAVE_MMAP
48# endif
49# endif
50# include <limits.h>
51# ifndef PAGESIZE
52# define PAGESIZE pagesize
53# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
54static long pagesize;
55# else
56# define BOOT_PAGESIZE (void)0
57# endif
58#else
59# define PAGESIZE 0
60# define BOOT_PAGESIZE (void)0
61#endif
62
63#if CORO_USE_VALGRIND
64# include <valgrind/valgrind.h>
65#endif
66
67/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
68static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
69 80
70#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
71# define HAS_SCOPESTACK_NAME 1 82# define HAS_SCOPESTACK_NAME 1
72#endif
73
74#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
75# undef CORO_STACKGUARD
76#endif
77
78#ifndef CORO_STACKGUARD
79# define CORO_STACKGUARD 0
80#endif 83#endif
81 84
82/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
83#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
84# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
175typedef struct coro_cctx 178typedef struct coro_cctx
176{ 179{
177 struct coro_cctx *next; 180 struct coro_cctx *next;
178 181
179 /* the stack */ 182 /* the stack */
180 void *sptr; 183 struct coro_stack stack;
181 size_t ssize;
182 184
183 /* cpu state */ 185 /* cpu state */
184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG 187#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
254 SV *saved_deffh; 256 SV *saved_deffh;
255 SV *invoke_cb; 257 SV *invoke_cb;
256 AV *invoke_av; 258 AV *invoke_av;
257 259
258 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
259 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
260 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
261 263
262 /* swap_sv */ 264 /* swap_sv */
263 AV *swap_sv; 265 AV *swap_sv;
264 266
265 /* times */ 267 /* times */
… …
295#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
296 298
297/** JIT *********************************************************************/ 299/** JIT *********************************************************************/
298 300
299#if CORO_JIT 301#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */ 302 /* APPLE doesn't have mmap though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE 304 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY 305 #if ECB_AMD64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix" 306 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY 307 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix" 308 #define CORO_JIT_TYPE "x86-unix"
307 #endif 309 #endif
308 #endif 310 #endif
309#endif 311#endif
310 312
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
312 #undef CORO_JIT 314 #undef CORO_JIT
313#endif 315#endif
314 316
315#if CORO_JIT 317#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *); 318 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
373time_init (pTHX) 375time_init (pTHX)
374{ 376{
375 SV **svp; 377 SV **svp;
376 378
377 require_pv ("Time/HiRes.pm"); 379 require_pv ("Time/HiRes.pm");
378 380
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380 382
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 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");
383 385
… …
501 503
502 return 0; 504 return 0;
503} 505}
504 506
505ecb_inline struct coro * 507ecb_inline struct coro *
506SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro_sv)
507{ 509{
508 MAGIC *mg; 510 MAGIC *mg;
509 511
510 if (SvROK (coro)) 512 if (SvROK (coro_sv))
511 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
512 514
513 mg = SvSTATEhv_p (aTHX_ coro); 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
514 if (!mg) 516 if (!mg)
515 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
516 518
517 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
518} 520}
… …
524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
525 527
526/*****************************************************************************/ 528/*****************************************************************************/
527/* padlist management and caching */ 529/* padlist management and caching */
528 530
529ecb_inline AV * 531ecb_inline PADLIST *
530coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
531{ 533{
532 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
533 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
534 539
535 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. */
536 AvREAL_off (newpadlist); 568 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 569#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
543 --AvFILLp (padlist);
544 570
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 571 /* Already extended to 2 elements by newPADLIST. */
546 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;
547 579
548 return newpadlist; 580 return newpadlist;
549} 581}
550 582
551ecb_inline void 583ecb_inline void
552free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
553{ 585{
554 /* may be during global destruction */ 586 /* may be during global destruction */
555 if (!IN_DESTRUCT) 587 if (!IN_DESTRUCT)
556 { 588 {
557 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
558 590
559 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
560 { 592 {
561 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av);
564 595
596 if (pad)
597 {
598 I32 j = PadMAX (pad);
599
565 while (j >= 0) 600 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 602
568 AvFILLp (av) = -1; 603 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 604 SvREFCNT_dec (pad);
605 }
570 } 606 }
571 607
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
573 609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
574 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
576 } 618 }
577} 619}
578 620
579static int 621static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 623{
582 AV *padlist; 624 PADLIST *padlist;
583 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;
584 627
585 /* perl manages to free our internal AV and _then_ call us */ 628 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 629 if (IN_DESTRUCT)
587 return 0; 630 return 0;
588 631
589 /* casting is fun. */ 632 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 634
595 return 0; 635 return 0;
596} 636}
597 637
598static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
604ecb_inline void 644ecb_inline void
605get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
606{ 646{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 648 size_t *lenp;
609 649
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 652 else
613 { 653 {
614#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
… …
626 666
627ecb_inline void 667ecb_inline void
628put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
629{ 669{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 671
633 if (ecb_expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
634 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);
635 682
636 av = (AV *)mg->mg_obj; 683 ((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} 684}
643 685
644/** load & save, init *******************************************************/ 686/** load & save, init *******************************************************/
645 687
646ecb_inline void 688ecb_inline void
… …
667 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;
668 710
669 /* 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,
670 * 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.
671 */ 713 */
672 #define svany_in_head(type) \ 714 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
673 (((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)))
674 720
675 if (svany_in_head (SvTYPE (a))) 721 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 722 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677 723
678 if (svany_in_head (SvTYPE (b))) 724 if (svany_in_head (SvTYPE (b)))
… …
721 /* now do the ugly restore mess */ 767 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 768 while (ecb_expect_true (cv = (CV *)POPs))
723 { 769 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 770 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 771 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 772 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 773 }
728 774
729 PUTBACK; 775 PUTBACK;
730 } 776 }
731 777
… …
746 792
747 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 793 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
748 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
749 } 795 }
750 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
751 SWAP_SVS (c); 805 SWAP_SVS (c);
752} 806}
753 807
754static void 808static void
755save_perl (pTHX_ Coro__State c) 809save_perl (pTHX_ Coro__State c)
756{ 810{
757 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 }
758 820
759 if (ecb_expect_false (c->on_leave)) 821 if (ecb_expect_false (c->on_leave))
760 { 822 {
761 int i; 823 int i;
762 824
… …
994 { 1056 {
995 SV **svp = 0; 1057 SV **svp = 0;
996 1058
997 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1059 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
998 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1060 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
999 1061
1000 if (svp) 1062 if (svp)
1001 { 1063 {
1002 SV *ssv; 1064 SV *ssv;
1003 1065
1004 if (!*svp) 1066 if (!*svp)
… …
1110 PL_hints = 0; 1172 PL_hints = 0;
1111 1173
1112 /* recreate the die/warn hooks */ 1174 /* recreate the die/warn hooks */
1113 PL_diehook = SvREFCNT_inc (rv_diehook); 1175 PL_diehook = SvREFCNT_inc (rv_diehook);
1114 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1176 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1115 1177
1116 GvSV (PL_defgv) = newSV (0); 1178 GvSV (PL_defgv) = newSV (0);
1117 GvAV (PL_defgv) = coro->args; coro->args = 0; 1179 GvAV (PL_defgv) = coro->args; coro->args = 0;
1118 GvSV (PL_errgv) = newSV (0); 1180 GvSV (PL_errgv) = newSV (0);
1119 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);
1120 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
1121 PL_rs = newSVsv (GvSV (irsgv)); 1186 PL_rs = newSVsv (GvSV (irsgv));
1122 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1187 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1123 1188
1124 { 1189 {
1125 dSP; 1190 dSP;
… …
1235 1300
1236 SvREFCNT_dec (coro->saved_deffh); 1301 SvREFCNT_dec (coro->saved_deffh);
1237 SvREFCNT_dec (coro->rouse_cb); 1302 SvREFCNT_dec (coro->rouse_cb);
1238 SvREFCNT_dec (coro->invoke_cb); 1303 SvREFCNT_dec (coro->invoke_cb);
1239 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);
1240 } 1307 }
1241} 1308}
1242 1309
1243ecb_inline void 1310ecb_inline void
1244free_coro_mortal (pTHX) 1311free_coro_mortal (pTHX)
… …
1307 1374
1308 if (PL_curcop != &PL_compiling) 1375 if (PL_curcop != &PL_compiling)
1309 { 1376 {
1310 SV **cb; 1377 SV **cb;
1311 1378
1312 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1379 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1313 { 1380 {
1314 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1381 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1315 1382
1316 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1383 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1317 { 1384 {
… …
1489static coro_cctx * 1556static coro_cctx *
1490cctx_new_empty (void) 1557cctx_new_empty (void)
1491{ 1558{
1492 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1493 1560
1494 cctx->sptr = 0; 1561 cctx->stack.sptr = 0;
1495 coro_create (&cctx->cctx, 0, 0, 0, 0); 1562 coro_create (&cctx->cctx, 0, 0, 0, 0);
1496 1563
1497 return cctx; 1564 return cctx;
1498} 1565}
1499 1566
1500/* create a new cctx suitable as destination/running a perl interpreter */ 1567/* create a new cctx suitable as destination/running a perl interpreter */
1501static coro_cctx * 1568static coro_cctx *
1502cctx_new_run (void) 1569cctx_new_run (void)
1503{ 1570{
1504 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1505 void *stack_start;
1506 size_t stack_size;
1507 1572
1508#if HAVE_MMAP 1573 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1509 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1510 /* mmap supposedly does allocate-on-write for us */
1511 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1512
1513 if (cctx->sptr != (void *)-1)
1514 {
1515 #if CORO_STACKGUARD
1516 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1517 #endif
1518 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1519 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1520 cctx->flags |= CC_MAPPED;
1521 } 1574 {
1522 else
1523#endif
1524 {
1525 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1526 New (0, cctx->sptr, cctx_stacksize, long);
1527
1528 if (!cctx->sptr)
1529 {
1530 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1575 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1531 _exit (EXIT_FAILURE); 1576 _exit (EXIT_FAILURE);
1532 }
1533
1534 stack_start = cctx->sptr;
1535 stack_size = cctx->ssize;
1536 } 1577 }
1537 1578
1538 #if CORO_USE_VALGRIND
1539 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1540 #endif
1541
1542 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);
1543 1580
1544 return cctx; 1581 return cctx;
1545} 1582}
1546 1583
1547static void 1584static void
… …
1553 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1590 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1554 1591
1555 --cctx_count; 1592 --cctx_count;
1556 coro_destroy (&cctx->cctx); 1593 coro_destroy (&cctx->cctx);
1557 1594
1558 /* coro_transfer creates new, empty cctx's */ 1595 coro_stack_free (&cctx->stack);
1559 if (cctx->sptr)
1560 {
1561 #if CORO_USE_VALGRIND
1562 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1563 #endif
1564
1565#if HAVE_MMAP
1566 if (cctx->flags & CC_MAPPED)
1567 munmap (cctx->sptr, cctx->ssize);
1568 else
1569#endif
1570 Safefree (cctx->sptr);
1571 }
1572 1596
1573 Safefree (cctx); 1597 Safefree (cctx);
1574} 1598}
1575 1599
1576/* wether this cctx should be destructed */ 1600/* wether this cctx should be destructed */
… …
1595} 1619}
1596 1620
1597static void 1621static void
1598cctx_put (coro_cctx *cctx) 1622cctx_put (coro_cctx *cctx)
1599{ 1623{
1600 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));
1601 1625
1602 /* free another cctx if overlimit */ 1626 /* free another cctx if overlimit */
1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1627 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1604 { 1628 {
1605 coro_cctx *first = cctx_first; 1629 coro_cctx *first = cctx_first;
… …
1731 return; 1755 return;
1732 1756
1733 slf_destroy (aTHX_ coro); 1757 slf_destroy (aTHX_ coro);
1734 1758
1735 coro->flags |= CF_ZOMBIE; 1759 coro->flags |= CF_ZOMBIE;
1736 1760
1737 if (coro->flags & CF_READY) 1761 if (coro->flags & CF_READY)
1738 { 1762 {
1739 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1763 /* reduce nready, as destroying a ready coro effectively unreadies it */
1740 /* alternative: look through all ready queues and remove the coro */ 1764 /* alternative: look through all ready queues and remove the coro */
1741 --coro_nready; 1765 --coro_nready;
… …
1937 /* nothing to schedule: call the idle handler */ 1961 /* nothing to schedule: call the idle handler */
1938 if (SvROK (sv_idle) 1962 if (SvROK (sv_idle)
1939 && SvOBJECT (SvRV (sv_idle))) 1963 && SvOBJECT (SvRV (sv_idle)))
1940 { 1964 {
1941 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);
1942 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 }
1943 1984
1944 ++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 */
1945 api_ready (aTHX_ SvRV (sv_idle)); 1986 api_ready (aTHX_ SvRV (sv_idle));
1946 --coro_nready; 1987 --coro_nready;
1947 } 1988 }
… …
2145 AV *od = coro->on_destroy; 2186 AV *od = coro->on_destroy;
2146 2187
2147 if (!od) 2188 if (!od)
2148 return; 2189 return;
2149 2190
2191 coro->on_destroy = 0;
2192 sv_2mortal ((SV *)od);
2193
2150 while (AvFILLp (od) >= 0) 2194 while (AvFILLp (od) >= 0)
2151 { 2195 {
2152 SV *cb = sv_2mortal (av_pop (od)); 2196 SV *cb = sv_2mortal (av_pop (od));
2153 2197
2154 /* 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 */
… …
2174 2218
2175static void 2219static void
2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2220coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2177{ 2221{
2178 AV *av; 2222 AV *av;
2179 2223
2180 if (coro->status) 2224 if (coro->status)
2181 { 2225 {
2182 av = coro->status; 2226 av = coro->status;
2183 av_clear (av); 2227 av_clear (av);
2184 } 2228 }
… …
2231 2275
2232 coro = SvSTATE (arg [0]); 2276 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv; 2277 coro_hv = coro->hv;
2234 2278
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2279 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236 2280
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2281 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 { 2282 {
2239 /* coro currently busy cancelling something, so just notify it */ 2283 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro; 2284 coro->slf_frame.data = (void *)coro;
2241 2285
… …
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2292 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 } 2293 }
2250 else 2294 else
2251 { 2295 {
2252 struct coro *self = SvSTATE_current; 2296 struct coro *self = SvSTATE_current;
2297
2298 if (!self)
2299 croak ("Coro::cancel called outside of thread content,");
2253 2300
2254 /* otherwise we cancel directly, purely for speed reasons 2301 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as 2302 * unfortunately, this requires some magic trickery, as
2256 * 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.
2257 * this is ugly, and hopefully fully worth the extra speed. 2304 * this is ugly, and hopefully fully worth the extra speed.
… …
2420 2467
2421static int 2468static int
2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2469slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2423{ 2470{
2424 SV *data = (SV *)frame->data; 2471 SV *data = (SV *)frame->data;
2425 2472
2426 if (CORO_THROW) 2473 if (CORO_THROW)
2427 return 0; 2474 return 0;
2428 2475
2429 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2476 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2430 return 1; 2477 return 1;
… …
2466 cb = sv_2mortal (coro->rouse_cb); 2513 cb = sv_2mortal (coro->rouse_cb);
2467 coro->rouse_cb = 0; 2514 coro->rouse_cb = 0;
2468 } 2515 }
2469 2516
2470 if (!SvROK (cb) 2517 if (!SvROK (cb)
2471 || SvTYPE (SvRV (cb)) != SVt_PVCV 2518 || SvTYPE (SvRV (cb)) != SVt_PVCV
2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2519 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2473 croak ("Coro::rouse_wait called with illegal callback argument,"); 2520 croak ("Coro::rouse_wait called with illegal callback argument,");
2474 2521
2475 { 2522 {
2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2523 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2599 2646
2600/* "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 */
2601static void 2648static void
2602slf_destroy (pTHX_ struct coro *coro) 2649slf_destroy (pTHX_ struct coro *coro)
2603{ 2650{
2604 /* this callback is reserved for slf functions needing to do cleanup */ 2651 struct CoroSLF frame = coro->slf_frame;
2605 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2606 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2607 2652
2608 /* 2653 /*
2609 * The on_destroy above most likely is from an SLF call. 2654 * The on_destroy below most likely is from an SLF call.
2610 * 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
2611 * the coro, we will have to force-finish it here, otherwise 2656 * the coro, we will have to force-finish it here, otherwise
2612 * cleanup functions cannot call SLF functions. 2657 * cleanup functions cannot call SLF functions.
2613 */ 2658 */
2614 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);
2615} 2664}
2616 2665
2617/* 2666/*
2618 * these not obviously related functions are all rolled into one 2667 * these not obviously related functions are all rolled into one
2619 * 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
… …
2802static void 2851static void
2803coro_pop_on_leave (pTHX_ void *coro) 2852coro_pop_on_leave (pTHX_ void *coro)
2804{ 2853{
2805 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);
2806 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);
2807} 2948}
2808 2949
2809/*****************************************************************************/ 2950/*****************************************************************************/
2810/* PerlIO::cede */ 2951/* PerlIO::cede */
2811 2952
… …
2941 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3082 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2942 PUTBACK; 3083 PUTBACK;
2943 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3084 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2944 } 3085 }
2945 3086
2946 SvREFCNT_dec (cb); 3087 SvREFCNT_dec_NN (cb);
2947 } 3088 }
2948} 3089}
2949 3090
2950static void 3091static void
2951coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3092coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2959{ 3100{
2960 AV *av = (AV *)frame->data; 3101 AV *av = (AV *)frame->data;
2961 SV *count_sv = AvARRAY (av)[0]; 3102 SV *count_sv = AvARRAY (av)[0];
2962 SV *coro_hv = SvRV (coro_current); 3103 SV *coro_hv = SvRV (coro_current);
2963 3104
3105 frame->destroy = 0;
3106
2964 /* 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 */
2965 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
2966 return 0; 3113 return 0;
3114 }
2967 else if (SvIVX (count_sv) > 0) 3115 else if (SvIVX (count_sv) > 0)
2968 { 3116 {
2969 frame->destroy = 0;
2970
2971 if (acquire) 3117 if (acquire)
2972 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3118 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2973 else 3119 else
2974 coro_semaphore_adjust (aTHX_ av, 0); 3120 coro_semaphore_adjust (aTHX_ av, 0);
2975 3121
… …
3086 { 3232 {
3087 api_ready (aTHX_ cb); 3233 api_ready (aTHX_ cb);
3088 sv_setiv (cb, 0); /* signal waiter */ 3234 sv_setiv (cb, 0); /* signal waiter */
3089 } 3235 }
3090 3236
3091 SvREFCNT_dec (cb); 3237 SvREFCNT_dec_NN (cb);
3092 3238
3093 --count; 3239 --count;
3094 } 3240 }
3095} 3241}
3096 3242
… …
3181 } 3327 }
3182 3328
3183 av_push (state, data_sv); 3329 av_push (state, data_sv);
3184 3330
3185 api_ready (aTHX_ coro); 3331 api_ready (aTHX_ coro);
3186 SvREFCNT_dec (coro); 3332 SvREFCNT_dec_NN (coro);
3187 SvREFCNT_dec ((AV *)state); 3333 SvREFCNT_dec_NN ((AV *)state);
3188} 3334}
3189 3335
3190static int 3336static int
3191slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3337slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3192{ 3338{
… …
3197 /* it quickly returns */ 3343 /* it quickly returns */
3198 if (CORO_THROW) 3344 if (CORO_THROW)
3199 return 0; 3345 return 0;
3200 3346
3201 /* one element that is an RV? repeat! */ 3347 /* one element that is an RV? repeat! */
3202 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3348 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3203 return 1; 3349 return 1;
3204 3350
3205 /* restore status */ 3351 /* restore status */
3206 { 3352 {
3207 SV *data_sv = av_pop (state); 3353 SV *data_sv = av_pop (state);
… …
3210 errno = data->errorno; 3356 errno = data->errorno;
3211 PL_laststype = data->laststype; 3357 PL_laststype = data->laststype;
3212 PL_laststatval = data->laststatval; 3358 PL_laststatval = data->laststatval;
3213 PL_statcache = data->statcache; 3359 PL_statcache = data->statcache;
3214 3360
3215 SvREFCNT_dec (data_sv); 3361 SvREFCNT_dec_NN (data_sv);
3216 } 3362 }
3217 3363
3218 /* push result values */ 3364 /* push result values */
3219 { 3365 {
3220 dSP; 3366 dSP;
… …
3435 3581
3436PROTOTYPES: DISABLE 3582PROTOTYPES: DISABLE
3437 3583
3438BOOT: 3584BOOT:
3439{ 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"
3440#ifdef USE_ITHREADS 3588#ifdef USE_ITHREADS
3441# if CORO_PTHREAD 3589# if CORO_PTHREAD
3442 coro_thx = PERL_GET_CONTEXT; 3590 coro_thx = PERL_GET_CONTEXT;
3443# endif 3591# endif
3444#endif 3592#endif
3445 BOOT_PAGESIZE;
3446
3447 /* 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 */
3448 /* 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 */
3449 /* programs trying to delete them, but... */ 3595 /* programs trying to delete them, but... */
3450 /* 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 */
3451 DEFSV; 3597 DEFSV;
… …
3521void 3667void
3522transfer (...) 3668transfer (...)
3523 PROTOTYPE: $$ 3669 PROTOTYPE: $$
3524 CODE: 3670 CODE:
3525 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3671 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3526
3527void
3528_exit (int code)
3529 PROTOTYPE: $
3530 CODE:
3531 _exit (code);
3532 3672
3533SV * 3673SV *
3534clone (Coro::State coro) 3674clone (Coro::State coro)
3535 CODE: 3675 CODE:
3536{ 3676{
… …
3591void 3731void
3592list () 3732list ()
3593 PROTOTYPE: 3733 PROTOTYPE:
3594 PPCODE: 3734 PPCODE:
3595{ 3735{
3596 struct coro *coro; 3736 struct coro *coro;
3597 for (coro = coro_first; coro; coro = coro->next) 3737 for (coro = coro_first; coro; coro = coro->next)
3598 if (coro->hv) 3738 if (coro->hv)
3599 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3739 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3600} 3740}
3601 3741
… …
3763 3903
3764void 3904void
3765times (Coro::State self) 3905times (Coro::State self)
3766 PPCODE: 3906 PPCODE:
3767{ 3907{
3768 struct coro *current = SvSTATE (coro_current); 3908 struct coro *current = SvSTATE (coro_current);
3769 3909
3770 if (ecb_expect_false (current == self)) 3910 if (ecb_expect_false (current == self))
3771 { 3911 {
3772 coro_times_update (); 3912 coro_times_update ();
3773 coro_times_add (SvSTATE (coro_current)); 3913 coro_times_add (SvSTATE (coro_current));
… …
3803 3943
3804MODULE = Coro::State PACKAGE = Coro 3944MODULE = Coro::State PACKAGE = Coro
3805 3945
3806BOOT: 3946BOOT:
3807{ 3947{
3948 if (SVt_LAST > 32)
3949 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3950
3808 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3951 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3809 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3952 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3810 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3953 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3811 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);
3812 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3816 3959
3817 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);
3818 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3961 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3819 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);
3820 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 */
3821 3964
3822 coro_stash = gv_stashpv ("Coro", TRUE); 3965 coro_stash = gv_stashpv ("Coro", TRUE);
3823 3966
3824 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3967 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3825 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3968 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3826 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3969 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3838 coroapi.ready = api_ready; 3981 coroapi.ready = api_ready;
3839 coroapi.is_ready = api_is_ready; 3982 coroapi.is_ready = api_is_ready;
3840 coroapi.nready = coro_nready; 3983 coroapi.nready = coro_nready;
3841 coroapi.current = coro_current; 3984 coroapi.current = coro_current;
3842 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
3843 /*GCoroAPI = &coroapi;*/ 3990 /*GCoroAPI = &coroapi;*/
3844 sv_setiv (sv, (IV)&coroapi); 3991 sv_setiv (sv, (IV)&coroapi);
3845 SvREADONLY_on (sv); 3992 SvREADONLY_on (sv);
3846 } 3993 }
3847} 3994}
… …
3912 4059
3913void 4060void
3914_set_current (SV *current) 4061_set_current (SV *current)
3915 PROTOTYPE: $ 4062 PROTOTYPE: $
3916 CODE: 4063 CODE:
3917 SvREFCNT_dec (SvRV (coro_current)); 4064 SvREFCNT_dec_NN (SvRV (coro_current));
3918 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4065 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3919 4066
3920void 4067void
3921_set_readyhook (SV *hook) 4068_set_readyhook (SV *hook)
3922 PROTOTYPE: $ 4069 PROTOTYPE: $
… …
4006 4153
4007 if ((SV *)hv == &PL_sv_undef) 4154 if ((SV *)hv == &PL_sv_undef)
4008 { 4155 {
4009 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);
4010 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4157 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4011 SvREFCNT_dec (sv); 4158 SvREFCNT_dec_NN (sv);
4012 } 4159 }
4013 4160
4014 { 4161 {
4015 struct coro *coro = SvSTATE_hv (hv); 4162 struct coro *coro = SvSTATE_hv (hv);
4016 4163
… …
4023 api_ready (aTHX_ (SV *)hv); 4170 api_ready (aTHX_ (SV *)hv);
4024 4171
4025 if (GIMME_V != G_VOID) 4172 if (GIMME_V != G_VOID)
4026 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4173 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4027 else 4174 else
4028 SvREFCNT_dec (hv); 4175 SvREFCNT_dec_NN (hv);
4029} 4176}
4030 4177
4031SV * 4178SV *
4032rouse_cb () 4179rouse_cb ()
4033 PROTOTYPE: 4180 PROTOTYPE:
… …
4048 on_leave = 1 4195 on_leave = 1
4049 PROTOTYPE: & 4196 PROTOTYPE: &
4050 CODE: 4197 CODE:
4051{ 4198{
4052 struct coro *coro = SvSTATE_current; 4199 struct coro *coro = SvSTATE_current;
4053 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4200 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4054 4201
4055 block = s_get_cv_croak (block); 4202 block = s_get_cv_croak (block);
4056 4203
4057 if (!*avp) 4204 if (!*avp)
4058 *avp = newAV (); 4205 *avp = newAV ();
… …
4078 4225
4079SV * 4226SV *
4080new (SV *klass, SV *count = 0) 4227new (SV *klass, SV *count = 0)
4081 CODE: 4228 CODE:
4082{ 4229{
4083 int semcnt = 1; 4230 int semcnt = 1;
4084 4231
4085 if (count) 4232 if (count)
4086 { 4233 {
4087 SvGETMAGIC (count); 4234 SvGETMAGIC (count);
4088 4235
… …
4148 XSRETURN_NO; 4295 XSRETURN_NO;
4149} 4296}
4150 4297
4151void 4298void
4152waiters (SV *self) 4299waiters (SV *self)
4153 PPCODE: 4300 PPCODE:
4154{ 4301{
4155 AV *av = (AV *)SvRV (self); 4302 AV *av = (AV *)SvRV (self);
4156 int wcount = AvFILLp (av) + 1 - 1; 4303 int wcount = AvFILLp (av) + 1 - 1;
4157 4304
4158 if (GIMME_V == G_SCALAR) 4305 if (GIMME_V == G_SCALAR)
… …
4170 4317
4171void 4318void
4172_may_delete (SV *sem, int count, unsigned int extra_refs) 4319_may_delete (SV *sem, int count, unsigned int extra_refs)
4173 PPCODE: 4320 PPCODE:
4174{ 4321{
4175 AV *av = (AV *)SvRV (sem); 4322 AV *av = (AV *)SvRV (sem);
4176 4323
4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4324 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4178 && AvFILLp (av) == 0 /* no waiters, just count */ 4325 && AvFILLp (av) == 0 /* no waiters, just count */
4179 && SvIV (AvARRAY (av)[0]) == count) 4326 && SvIV (AvARRAY (av)[0]) == count)
4180 XSRETURN_YES; 4327 XSRETURN_YES;
… …
4201 4348
4202void 4349void
4203broadcast (SV *self) 4350broadcast (SV *self)
4204 CODE: 4351 CODE:
4205{ 4352{
4206 AV *av = (AV *)SvRV (self); 4353 AV *av = (AV *)SvRV (self);
4207 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4354 coro_signal_wake (aTHX_ av, AvFILLp (av));
4208} 4355}
4209 4356
4210void 4357void
4211send (SV *self) 4358send (SV *self)
… …
4219 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4366 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4220} 4367}
4221 4368
4222IV 4369IV
4223awaited (SV *self) 4370awaited (SV *self)
4224 CODE: 4371 CODE:
4225 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4372 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4226 OUTPUT: 4373 OUTPUT:
4227 RETVAL 4374 RETVAL
4228 4375
4229 4376
… …
4234 4381
4235void 4382void
4236_schedule (...) 4383_schedule (...)
4237 CODE: 4384 CODE:
4238{ 4385{
4239 static int incede; 4386 static int incede;
4240 4387
4241 api_cede_notself (aTHX); 4388 api_cede_notself (aTHX);
4242 4389
4243 ++incede; 4390 ++incede;
4244 while (coro_nready >= incede && api_cede (aTHX)) 4391 while (coro_nready >= incede && api_cede (aTHX))
… …
4288 { 4435 {
4289 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4436 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4290 coro_old_pp_sselect = 0; 4437 coro_old_pp_sselect = 0;
4291 } 4438 }
4292 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