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.419 by root, Mon Feb 20 08:13:25 2012 UTC vs.
Revision 1.455 by root, Sun Oct 4 13:07:55 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
… …
135 140
136static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
137static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
138static SV *rv_diehook; 143static SV *rv_diehook;
139static SV *rv_warnhook; 144static SV *rv_warnhook;
140static HV *hv_sig; /* %SIG */
141 145
142/* async_pool helper stuff */ 146/* async_pool helper stuff */
143static SV *sv_pool_rss; 147static SV *sv_pool_rss;
144static SV *sv_pool_size; 148static SV *sv_pool_size;
145static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
173typedef struct coro_cctx 177typedef struct coro_cctx
174{ 178{
175 struct coro_cctx *next; 179 struct coro_cctx *next;
176 180
177 /* the stack */ 181 /* the stack */
178 void *sptr; 182 struct coro_stack stack;
179 size_t ssize;
180 183
181 /* cpu state */ 184 /* cpu state */
182 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
183#ifndef NDEBUG 186#ifndef NDEBUG
184 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
252 SV *saved_deffh; 255 SV *saved_deffh;
253 SV *invoke_cb; 256 SV *invoke_cb;
254 AV *invoke_av; 257 AV *invoke_av;
255 258
256 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
257 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
258 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
259 262
260 /* swap_sv */ 263 /* swap_sv */
261 AV *swap_sv; 264 AV *swap_sv;
262 265
263 /* times */ 266 /* times */
… …
293#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
294 297
295/** JIT *********************************************************************/ 298/** JIT *********************************************************************/
296 299
297#if CORO_JIT 300#if CORO_JIT
298 /* APPLE doesn't have HAVE_MMAP though */ 301 /* APPLE doesn't have mmap though */
299 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
300 #ifndef CORO_JIT_TYPE 303 #ifndef CORO_JIT_TYPE
301 #if __x86_64 && CORO_JIT_UNIXY 304 #if ECB_AMD64 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "amd64-unix" 305 #define CORO_JIT_TYPE "amd64-unix"
303 #elif __i386 && CORO_JIT_UNIXY 306 #elif __i386 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "x86-unix" 307 #define CORO_JIT_TYPE "x86-unix"
305 #endif 308 #endif
306 #endif 309 #endif
307#endif 310#endif
308 311
309#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
310 #undef CORO_JIT 313 #undef CORO_JIT
311#endif 314#endif
312 315
313#if CORO_JIT 316#if CORO_JIT
314 typedef void (*load_save_perl_slots_type)(perl_slots *); 317 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
371time_init (pTHX) 374time_init (pTHX)
372{ 375{
373 SV **svp; 376 SV **svp;
374 377
375 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
376 379
377 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
378 381
379 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
380 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
381 384
… …
499 502
500 return 0; 503 return 0;
501} 504}
502 505
503ecb_inline struct coro * 506ecb_inline struct coro *
504SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
505{ 508{
506 MAGIC *mg; 509 MAGIC *mg;
507 510
508 if (SvROK (coro)) 511 if (SvROK (coro_sv))
509 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
510 513
511 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
512 if (!mg) 515 if (!mg)
513 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
514 517
515 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
516} 519}
… …
522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
523 526
524/*****************************************************************************/ 527/*****************************************************************************/
525/* padlist management and caching */ 528/* padlist management and caching */
526 529
527ecb_inline AV * 530ecb_inline PADLIST *
528coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
529{ 532{
530 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
531 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
532 538
533 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
534 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
535#if PERL_VERSION_ATLEAST (5,10,0)
536 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
537#else
538 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
539#endif 568#endif
540 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
541 --AvFILLp (padlist);
542 569
543 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
544 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
545 578
546 return newpadlist; 579 return newpadlist;
547} 580}
548 581
549ecb_inline void 582ecb_inline void
550free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
551{ 584{
552 /* may be during global destruction */ 585 /* may be during global destruction */
553 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
554 { 587 {
555 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
556 589
557 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
558 { 591 {
559 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
560 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
561 I32 j = AvFILLp (av);
562 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
563 while (j >= 0) 599 while (j >= 0)
564 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
565 601
566 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
567 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
568 } 605 }
569 606
570 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
571 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
572 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
573 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
574 } 617 }
575} 618}
576 619
577static int 620static int
578coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
579{ 622{
580 AV *padlist; 623 PADLIST *padlist;
581 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
582 626
583 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
584 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
585 return 0; 629 return 0;
586 630
587 /* casting is fun. */ 631 while (len--)
588 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
589 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
590
591 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
592 633
593 return 0; 634 return 0;
594} 635}
595 636
596static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
… …
601/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
602ecb_inline void 643ecb_inline void
603get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
604{ 645{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 647 size_t *lenp;
607 648
608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
610 else 651 else
611 { 652 {
612#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
613 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
614 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
624 665
625ecb_inline void 666ecb_inline void
626put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
627{ 668{
628 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
629 AV *av;
630 670
631 if (ecb_expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
632 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
633 681
634 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
635
636 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
637 av_extend (av, AvFILLp (av) + 1);
638
639 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
640} 683}
641 684
642/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
643 686
644ecb_inline void 687ecb_inline void
… …
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666 709
667 /* if SvANY points to the head, we need to adjust the pointers, 710 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa. 711 * as the pointer for a still points to b, and maybe vice versa.
669 */ 712 */
670 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
672 719
673 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675 722
676 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
719 /* now do the ugly restore mess */ 766 /* now do the ugly restore mess */
720 while (ecb_expect_true (cv = (CV *)POPs)) 767 while (ecb_expect_true (cv = (CV *)POPs))
721 { 768 {
722 put_padlist (aTHX_ cv); /* mark this padlist as available */ 769 put_padlist (aTHX_ cv); /* mark this padlist as available */
723 CvDEPTH (cv) = PTR2IV (POPs); 770 CvDEPTH (cv) = PTR2IV (POPs);
724 CvPADLIST (cv) = (AV *)POPs; 771 CvPADLIST (cv) = (PADLIST *)POPs;
725 } 772 }
726 773
727 PUTBACK; 774 PUTBACK;
728 } 775 }
729 776
… …
744 791
745 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
746 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
747 } 794 }
748 795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
802 }
803
749 SWAP_SVS (c); 804 SWAP_SVS (c);
750} 805}
751 806
752static void 807static void
753save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
754{ 809{
755 SWAP_SVS (c); 810 SWAP_SVS (c);
811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
756 819
757 if (ecb_expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
758 { 821 {
759 int i; 822 int i;
760 823
… …
992 { 1055 {
993 SV **svp = 0; 1056 SV **svp = 0;
994 1057
995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
997 1060
998 if (svp) 1061 if (svp)
999 { 1062 {
1000 SV *ssv; 1063 SV *ssv;
1001 1064
1002 if (!*svp) 1065 if (!*svp)
… …
1108 PL_hints = 0; 1171 PL_hints = 0;
1109 1172
1110 /* recreate the die/warn hooks */ 1173 /* recreate the die/warn hooks */
1111 PL_diehook = SvREFCNT_inc (rv_diehook); 1174 PL_diehook = SvREFCNT_inc (rv_diehook);
1112 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1175 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1113 1176
1114 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
1115 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
1116 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
1117 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1118 GvHV (PL_hintgv) = 0; 1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
1119 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
1120 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1121 1187
1122 { 1188 {
1123 dSP; 1189 dSP;
… …
1233 1299
1234 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1235 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1236 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1237 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
1304 SvREFCNT_dec (coro->on_enter_xs);
1305 SvREFCNT_dec (coro->on_leave_xs);
1238 } 1306 }
1239} 1307}
1240 1308
1241ecb_inline void 1309ecb_inline void
1242free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
… …
1305 1373
1306 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1307 { 1375 {
1308 SV **cb; 1376 SV **cb;
1309 1377
1310 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1311 { 1379 {
1312 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1313 1381
1314 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1315 { 1383 {
… …
1416/* try to exit the same way perl's main function would do */ 1484/* try to exit the same way perl's main function would do */
1417/* we do not bother resetting the environment or other things *7 1485/* we do not bother resetting the environment or other things *7
1418/* that are not, uhm, essential */ 1486/* that are not, uhm, essential */
1419/* this obviously also doesn't work when perl is embedded */ 1487/* this obviously also doesn't work when perl is embedded */
1420static void ecb_noinline ecb_cold 1488static void ecb_noinline ecb_cold
1421perlish_exit (void) 1489perlish_exit (pTHX)
1422{ 1490{
1423 int exitstatus = perl_destruct (PL_curinterp); 1491 int exitstatus = perl_destruct (PL_curinterp);
1424 perl_free (PL_curinterp); 1492 perl_free (PL_curinterp);
1425 exit (exitstatus); 1493 exit (exitstatus);
1426} 1494}
… …
1462 * If perl-run returns we assume exit() was being called or the coro 1530 * If perl-run returns we assume exit() was being called or the coro
1463 * fell off the end, which seems to be the only valid (non-bug) 1531 * fell off the end, which seems to be the only valid (non-bug)
1464 * reason for perl_run to return. We try to mimic whatever perl is normally 1532 * reason for perl_run to return. We try to mimic whatever perl is normally
1465 * doing in that case. YMMV. 1533 * doing in that case. YMMV.
1466 */ 1534 */
1467 perlish_exit (); 1535 perlish_exit (aTHX);
1468 } 1536 }
1469} 1537}
1470 1538
1471static coro_cctx * 1539static coro_cctx *
1472cctx_new (void) 1540cctx_new (void)
… …
1487static coro_cctx * 1555static coro_cctx *
1488cctx_new_empty (void) 1556cctx_new_empty (void)
1489{ 1557{
1490 coro_cctx *cctx = cctx_new (); 1558 coro_cctx *cctx = cctx_new ();
1491 1559
1492 cctx->sptr = 0; 1560 cctx->stack.sptr = 0;
1493 coro_create (&cctx->cctx, 0, 0, 0, 0); 1561 coro_create (&cctx->cctx, 0, 0, 0, 0);
1494 1562
1495 return cctx; 1563 return cctx;
1496} 1564}
1497 1565
1498/* create a new cctx suitable as destination/running a perl interpreter */ 1566/* create a new cctx suitable as destination/running a perl interpreter */
1499static coro_cctx * 1567static coro_cctx *
1500cctx_new_run (void) 1568cctx_new_run (void)
1501{ 1569{
1502 coro_cctx *cctx = cctx_new (); 1570 coro_cctx *cctx = cctx_new ();
1503 void *stack_start;
1504 size_t stack_size;
1505 1571
1506#if HAVE_MMAP 1572 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1507 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1508 /* mmap supposedly does allocate-on-write for us */
1509 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1510
1511 if (cctx->sptr != (void *)-1)
1512 {
1513 #if CORO_STACKGUARD
1514 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1515 #endif
1516 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1517 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1518 cctx->flags |= CC_MAPPED;
1519 } 1573 {
1520 else
1521#endif
1522 {
1523 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1524 New (0, cctx->sptr, cctx_stacksize, long);
1525
1526 if (!cctx->sptr)
1527 {
1528 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1574 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1529 _exit (EXIT_FAILURE); 1575 _exit (EXIT_FAILURE);
1530 }
1531
1532 stack_start = cctx->sptr;
1533 stack_size = cctx->ssize;
1534 } 1576 }
1535 1577
1536 #if CORO_USE_VALGRIND
1537 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1538 #endif
1539
1540 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1578 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1541 1579
1542 return cctx; 1580 return cctx;
1543} 1581}
1544 1582
1545static void 1583static void
… …
1551 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1589 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1552 1590
1553 --cctx_count; 1591 --cctx_count;
1554 coro_destroy (&cctx->cctx); 1592 coro_destroy (&cctx->cctx);
1555 1593
1556 /* coro_transfer creates new, empty cctx's */ 1594 coro_stack_free (&cctx->stack);
1557 if (cctx->sptr)
1558 {
1559 #if CORO_USE_VALGRIND
1560 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1561 #endif
1562
1563#if HAVE_MMAP
1564 if (cctx->flags & CC_MAPPED)
1565 munmap (cctx->sptr, cctx->ssize);
1566 else
1567#endif
1568 Safefree (cctx->sptr);
1569 }
1570 1595
1571 Safefree (cctx); 1596 Safefree (cctx);
1572} 1597}
1573 1598
1574/* wether this cctx should be destructed */ 1599/* wether this cctx should be destructed */
… …
1593} 1618}
1594 1619
1595static void 1620static void
1596cctx_put (coro_cctx *cctx) 1621cctx_put (coro_cctx *cctx)
1597{ 1622{
1598 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1623 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1599 1624
1600 /* free another cctx if overlimit */ 1625 /* free another cctx if overlimit */
1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1626 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1602 { 1627 {
1603 coro_cctx *first = cctx_first; 1628 coro_cctx *first = cctx_first;
… …
1729 return; 1754 return;
1730 1755
1731 slf_destroy (aTHX_ coro); 1756 slf_destroy (aTHX_ coro);
1732 1757
1733 coro->flags |= CF_ZOMBIE; 1758 coro->flags |= CF_ZOMBIE;
1734 1759
1735 if (coro->flags & CF_READY) 1760 if (coro->flags & CF_READY)
1736 { 1761 {
1737 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1762 /* reduce nready, as destroying a ready coro effectively unreadies it */
1738 /* alternative: look through all ready queues and remove the coro */ 1763 /* alternative: look through all ready queues and remove the coro */
1739 --coro_nready; 1764 --coro_nready;
… …
1935 /* nothing to schedule: call the idle handler */ 1960 /* nothing to schedule: call the idle handler */
1936 if (SvROK (sv_idle) 1961 if (SvROK (sv_idle)
1937 && SvOBJECT (SvRV (sv_idle))) 1962 && SvOBJECT (SvRV (sv_idle)))
1938 { 1963 {
1939 if (SvRV (sv_idle) == SvRV (coro_current)) 1964 if (SvRV (sv_idle) == SvRV (coro_current))
1965 {
1966 require_pv ("Carp");
1967
1968 {
1969 dSP;
1970
1971 ENTER;
1972 SAVETMPS;
1973
1974 PUSHMARK (SP);
1940 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1976 PUTBACK;
1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1978
1979 FREETMPS;
1980 LEAVE;
1981 }
1982 }
1941 1983
1942 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1984 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1943 api_ready (aTHX_ SvRV (sv_idle)); 1985 api_ready (aTHX_ SvRV (sv_idle));
1944 --coro_nready; 1986 --coro_nready;
1945 } 1987 }
… …
2143 AV *od = coro->on_destroy; 2185 AV *od = coro->on_destroy;
2144 2186
2145 if (!od) 2187 if (!od)
2146 return; 2188 return;
2147 2189
2190 coro->on_destroy = 0;
2191 sv_2mortal ((SV *)od);
2192
2148 while (AvFILLp (od) >= 0) 2193 while (AvFILLp (od) >= 0)
2149 { 2194 {
2150 SV *cb = sv_2mortal (av_pop (od)); 2195 SV *cb = sv_2mortal (av_pop (od));
2151 2196
2152 /* coro hv's (and only hv's at the moment) are supported as well */ 2197 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2172 2217
2173static void 2218static void
2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2219coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2175{ 2220{
2176 AV *av; 2221 AV *av;
2177 2222
2178 if (coro->status) 2223 if (coro->status)
2179 { 2224 {
2180 av = coro->status; 2225 av = coro->status;
2181 av_clear (av); 2226 av_clear (av);
2182 } 2227 }
… …
2229 2274
2230 coro = SvSTATE (arg [0]); 2275 coro = SvSTATE (arg [0]);
2231 coro_hv = coro->hv; 2276 coro_hv = coro->hv;
2232 2277
2233 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2278 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2234 2279
2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2280 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2236 { 2281 {
2237 /* coro currently busy cancelling something, so just notify it */ 2282 /* coro currently busy cancelling something, so just notify it */
2238 coro->slf_frame.data = (void *)coro; 2283 coro->slf_frame.data = (void *)coro;
2239 2284
… …
2246 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2247 } 2292 }
2248 else 2293 else
2249 { 2294 {
2250 struct coro *self = SvSTATE_current; 2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2251 2299
2252 /* otherwise we cancel directly, purely for speed reasons 2300 /* otherwise we cancel directly, purely for speed reasons
2253 * unfortunately, this requires some magic trickery, as 2301 * unfortunately, this requires some magic trickery, as
2254 * somebody else could cancel us, so we have to fight the cancellation. 2302 * somebody else could cancel us, so we have to fight the cancellation.
2255 * this is ugly, and hopefully fully worth the extra speed. 2303 * this is ugly, and hopefully fully worth the extra speed.
… …
2418 2466
2419static int 2467static int
2420slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2468slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2421{ 2469{
2422 SV *data = (SV *)frame->data; 2470 SV *data = (SV *)frame->data;
2423 2471
2424 if (CORO_THROW) 2472 if (CORO_THROW)
2425 return 0; 2473 return 0;
2426 2474
2427 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2475 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2428 return 1; 2476 return 1;
… …
2464 cb = sv_2mortal (coro->rouse_cb); 2512 cb = sv_2mortal (coro->rouse_cb);
2465 coro->rouse_cb = 0; 2513 coro->rouse_cb = 0;
2466 } 2514 }
2467 2515
2468 if (!SvROK (cb) 2516 if (!SvROK (cb)
2469 || SvTYPE (SvRV (cb)) != SVt_PVCV 2517 || SvTYPE (SvRV (cb)) != SVt_PVCV
2470 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2518 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2471 croak ("Coro::rouse_wait called with illegal callback argument,"); 2519 croak ("Coro::rouse_wait called with illegal callback argument,");
2472 2520
2473 { 2521 {
2474 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2522 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2597 2645
2598/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2646/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2599static void 2647static void
2600slf_destroy (pTHX_ struct coro *coro) 2648slf_destroy (pTHX_ struct coro *coro)
2601{ 2649{
2602 /* this callback is reserved for slf functions needing to do cleanup */ 2650 struct CoroSLF frame = coro->slf_frame;
2603 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2604 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2605 2651
2606 /* 2652 /*
2607 * The on_destroy above most likely is from an SLF call. 2653 * The on_destroy below most likely is from an SLF call.
2608 * Since by definition the SLF call will not finish when we destroy 2654 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise 2655 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions. 2656 * cleanup functions cannot call SLF functions.
2611 */ 2657 */
2612 coro->slf_frame.prepare = 0; 2658 coro->slf_frame.prepare = 0;
2659
2660 /* this callback is reserved for slf functions needing to do cleanup */
2661 if (frame.destroy && frame.prepare && !PL_dirty)
2662 frame.destroy (aTHX_ &frame);
2613} 2663}
2614 2664
2615/* 2665/*
2616 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2617 * function to increase chances that they all will call transfer with the same 2667 * function to increase chances that they all will call transfer with the same
… …
2800static void 2850static void
2801coro_pop_on_leave (pTHX_ void *coro) 2851coro_pop_on_leave (pTHX_ void *coro)
2802{ 2852{
2803 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2804 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2855}
2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2805} 2947}
2806 2948
2807/*****************************************************************************/ 2949/*****************************************************************************/
2808/* PerlIO::cede */ 2950/* PerlIO::cede */
2809 2951
… …
2939 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2940 PUTBACK; 3082 PUTBACK;
2941 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2942 } 3084 }
2943 3085
2944 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2945 } 3087 }
2946} 3088}
2947 3089
2948static void 3090static void
2949coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2957{ 3099{
2958 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2959 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
2960 SV *coro_hv = SvRV (coro_current); 3102 SV *coro_hv = SvRV (coro_current);
2961 3103
3104 frame->destroy = 0;
3105
2962 /* if we are about to throw, don't actually acquire the lock, just throw */ 3106 /* if we are about to throw, don't actually acquire the lock, just throw */
2963 if (CORO_THROW) 3107 if (ecb_expect_false (CORO_THROW))
3108 {
3109 /* we still might be responsible for the semaphore, so wake up others */
3110 coro_semaphore_adjust (aTHX_ av, 0);
3111
2964 return 0; 3112 return 0;
3113 }
2965 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2966 { 3115 {
2967 frame->destroy = 0;
2968
2969 if (acquire) 3116 if (acquire)
2970 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2971 else 3118 else
2972 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2973 3120
… …
3084 { 3231 {
3085 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
3086 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
3087 } 3234 }
3088 3235
3089 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
3090 3237
3091 --count; 3238 --count;
3092 } 3239 }
3093} 3240}
3094 3241
… …
3179 } 3326 }
3180 3327
3181 av_push (state, data_sv); 3328 av_push (state, data_sv);
3182 3329
3183 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
3184 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
3185 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
3186} 3333}
3187 3334
3188static int 3335static int
3189slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3190{ 3337{
… …
3195 /* it quickly returns */ 3342 /* it quickly returns */
3196 if (CORO_THROW) 3343 if (CORO_THROW)
3197 return 0; 3344 return 0;
3198 3345
3199 /* one element that is an RV? repeat! */ 3346 /* one element that is an RV? repeat! */
3200 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3347 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3201 return 1; 3348 return 1;
3202 3349
3203 /* restore status */ 3350 /* restore status */
3204 { 3351 {
3205 SV *data_sv = av_pop (state); 3352 SV *data_sv = av_pop (state);
… …
3208 errno = data->errorno; 3355 errno = data->errorno;
3209 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
3210 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
3211 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
3212 3359
3213 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
3214 } 3361 }
3215 3362
3216 /* push result values */ 3363 /* push result values */
3217 { 3364 {
3218 dSP; 3365 dSP;
… …
3433 3580
3434PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
3435 3582
3436BOOT: 3583BOOT:
3437{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
3438#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
3439# if CORO_PTHREAD 3588# if CORO_PTHREAD
3440 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
3441# endif 3590# endif
3442#endif 3591#endif
3443 BOOT_PAGESIZE;
3444
3445 /* perl defines these to check for existance first, but why it doesn't */ 3592 /* perl defines these to check for existance first, but why it doesn't */
3446 /* just create them one at init time is not clear to me, except for */ 3593 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */ 3594 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */ 3595 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV; 3596 DEFSV;
… …
3456 3603
3457 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3458 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3459 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3460 3607
3461 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3462 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3463 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3464 3610
3465 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3466 3612
… …
3519void 3665void
3520transfer (...) 3666transfer (...)
3521 PROTOTYPE: $$ 3667 PROTOTYPE: $$
3522 CODE: 3668 CODE:
3523 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3669 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3524
3525void
3526_exit (int code)
3527 PROTOTYPE: $
3528 CODE:
3529 _exit (code);
3530 3670
3531SV * 3671SV *
3532clone (Coro::State coro) 3672clone (Coro::State coro)
3533 CODE: 3673 CODE:
3534{ 3674{
… …
3589void 3729void
3590list () 3730list ()
3591 PROTOTYPE: 3731 PROTOTYPE:
3592 PPCODE: 3732 PPCODE:
3593{ 3733{
3594 struct coro *coro; 3734 struct coro *coro;
3595 for (coro = coro_first; coro; coro = coro->next) 3735 for (coro = coro_first; coro; coro = coro->next)
3596 if (coro->hv) 3736 if (coro->hv)
3597 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3737 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3598} 3738}
3599 3739
… …
3663 RETVAL = boolSV (coro->flags & ix); 3803 RETVAL = boolSV (coro->flags & ix);
3664 OUTPUT: 3804 OUTPUT:
3665 RETVAL 3805 RETVAL
3666 3806
3667void 3807void
3668throw (Coro::State self, SV *exception = &PL_sv_undef) 3808throw (SV *self, SV *exception = &PL_sv_undef)
3669 PROTOTYPE: $;$ 3809 PROTOTYPE: $;$
3670 CODE: 3810 CODE:
3671{ 3811{
3812 struct coro *coro = SvSTATE (self);
3672 struct coro *current = SvSTATE_current; 3813 struct coro *current = SvSTATE_current;
3673 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3814 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3674 SvREFCNT_dec (*exceptionp); 3815 SvREFCNT_dec (*exceptionp);
3675 SvGETMAGIC (exception); 3816 SvGETMAGIC (exception);
3676 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3817 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3818
3819 api_ready (aTHX_ self);
3677} 3820}
3678 3821
3679void 3822void
3680api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3823api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3681 PROTOTYPE: $;$ 3824 PROTOTYPE: $;$
… …
3758 3901
3759void 3902void
3760times (Coro::State self) 3903times (Coro::State self)
3761 PPCODE: 3904 PPCODE:
3762{ 3905{
3763 struct coro *current = SvSTATE (coro_current); 3906 struct coro *current = SvSTATE (coro_current);
3764 3907
3765 if (ecb_expect_false (current == self)) 3908 if (ecb_expect_false (current == self))
3766 { 3909 {
3767 coro_times_update (); 3910 coro_times_update ();
3768 coro_times_add (SvSTATE (coro_current)); 3911 coro_times_add (SvSTATE (coro_current));
… …
3798 3941
3799MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3800 3943
3801BOOT: 3944BOOT:
3802{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3803 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3804 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3805 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3806 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3807 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3811 3957
3812 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3958 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3813 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3959 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3814 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3960 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3815 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3961 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3816 3962
3817 coro_stash = gv_stashpv ("Coro", TRUE); 3963 coro_stash = gv_stashpv ("Coro", TRUE);
3818 3964
3819 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3965 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3820 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3966 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3821 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3967 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3833 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3834 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3835 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3836 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3837 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3838 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3839 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3840 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3841 } 3991 }
3842} 3992}
… …
3907 4057
3908void 4058void
3909_set_current (SV *current) 4059_set_current (SV *current)
3910 PROTOTYPE: $ 4060 PROTOTYPE: $
3911 CODE: 4061 CODE:
3912 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3913 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3914 4064
3915void 4065void
3916_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3917 PROTOTYPE: $ 4067 PROTOTYPE: $
… …
4001 4151
4002 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
4003 { 4153 {
4004 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4005 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4006 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
4007 } 4157 }
4008 4158
4009 { 4159 {
4010 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
4011 4161
… …
4018 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
4019 4169
4020 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
4021 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4022 else 4172 else
4023 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
4024} 4174}
4025 4175
4026SV * 4176SV *
4027rouse_cb () 4177rouse_cb ()
4028 PROTOTYPE: 4178 PROTOTYPE:
… …
4043 on_leave = 1 4193 on_leave = 1
4044 PROTOTYPE: & 4194 PROTOTYPE: &
4045 CODE: 4195 CODE:
4046{ 4196{
4047 struct coro *coro = SvSTATE_current; 4197 struct coro *coro = SvSTATE_current;
4048 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4198 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4049 4199
4050 block = s_get_cv_croak (block); 4200 block = s_get_cv_croak (block);
4051 4201
4052 if (!*avp) 4202 if (!*avp)
4053 *avp = newAV (); 4203 *avp = newAV ();
… …
4073 4223
4074SV * 4224SV *
4075new (SV *klass, SV *count = 0) 4225new (SV *klass, SV *count = 0)
4076 CODE: 4226 CODE:
4077{ 4227{
4078 int semcnt = 1; 4228 int semcnt = 1;
4079 4229
4080 if (count) 4230 if (count)
4081 { 4231 {
4082 SvGETMAGIC (count); 4232 SvGETMAGIC (count);
4083 4233
… …
4143 XSRETURN_NO; 4293 XSRETURN_NO;
4144} 4294}
4145 4295
4146void 4296void
4147waiters (SV *self) 4297waiters (SV *self)
4148 PPCODE: 4298 PPCODE:
4149{ 4299{
4150 AV *av = (AV *)SvRV (self); 4300 AV *av = (AV *)SvRV (self);
4151 int wcount = AvFILLp (av) + 1 - 1; 4301 int wcount = AvFILLp (av) + 1 - 1;
4152 4302
4153 if (GIMME_V == G_SCALAR) 4303 if (GIMME_V == G_SCALAR)
… …
4165 4315
4166void 4316void
4167_may_delete (SV *sem, int count, unsigned int extra_refs) 4317_may_delete (SV *sem, int count, unsigned int extra_refs)
4168 PPCODE: 4318 PPCODE:
4169{ 4319{
4170 AV *av = (AV *)SvRV (sem); 4320 AV *av = (AV *)SvRV (sem);
4171 4321
4172 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4322 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4173 && AvFILLp (av) == 0 /* no waiters, just count */ 4323 && AvFILLp (av) == 0 /* no waiters, just count */
4174 && SvIV (AvARRAY (av)[0]) == count) 4324 && SvIV (AvARRAY (av)[0]) == count)
4175 XSRETURN_YES; 4325 XSRETURN_YES;
… …
4196 4346
4197void 4347void
4198broadcast (SV *self) 4348broadcast (SV *self)
4199 CODE: 4349 CODE:
4200{ 4350{
4201 AV *av = (AV *)SvRV (self); 4351 AV *av = (AV *)SvRV (self);
4202 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4352 coro_signal_wake (aTHX_ av, AvFILLp (av));
4203} 4353}
4204 4354
4205void 4355void
4206send (SV *self) 4356send (SV *self)
… …
4214 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4364 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4215} 4365}
4216 4366
4217IV 4367IV
4218awaited (SV *self) 4368awaited (SV *self)
4219 CODE: 4369 CODE:
4220 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4370 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4221 OUTPUT: 4371 OUTPUT:
4222 RETVAL 4372 RETVAL
4223 4373
4224 4374
… …
4229 4379
4230void 4380void
4231_schedule (...) 4381_schedule (...)
4232 CODE: 4382 CODE:
4233{ 4383{
4234 static int incede; 4384 static int incede;
4235 4385
4236 api_cede_notself (aTHX); 4386 api_cede_notself (aTHX);
4237 4387
4238 ++incede; 4388 ++incede;
4239 while (coro_nready >= incede && api_cede (aTHX)) 4389 while (coro_nready >= incede && api_cede (aTHX))
… …
4283 { 4433 {
4284 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4434 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4285 coro_old_pp_sselect = 0; 4435 coro_old_pp_sselect = 0;
4286 } 4436 }
4287 4437
4438MODULE = Coro::State PACKAGE = Coro::Util
4439
4440void
4441_exit (int code)
4442 CODE:
4443 _exit (code);
4444
4445NV
4446time ()
4447 CODE:
4448 RETVAL = nvtime (aTHX);
4449 OUTPUT:
4450 RETVAL
4451
4452NV
4453gettimeofday ()
4454 PPCODE:
4455{
4456 UV tv [2];
4457 u2time (aTHX_ tv);
4458 EXTEND (SP, 2);
4459 PUSHs (sv_2mortal (newSVuv (tv [0])));
4460 PUSHs (sv_2mortal (newSVuv (tv [1])));
4461}
4462

Diff Legend

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