ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.416 by root, Mon Dec 12 15:19:56 2011 UTC vs.
Revision 1.450 by root, Sun Jun 28 22:31:03 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
17#include "ecb.h" 20#include "ecb.h"
18 21
19#include <stddef.h> 22#include <stddef.h>
20#include <stdio.h> 23#include <stdio.h>
21#include <errno.h> 24#include <errno.h>
22#include <assert.h> 25#include <assert.h>
23 26
24#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
26#endif 58#endif
27 59
28#if defined(_WIN32) 60#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 61# undef HAS_GETTIMEOFDAY
30# undef setjmp 62# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
34#else 66#else
35# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
36#endif 68#endif
37 69
38#if HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 70/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
67 72
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 74# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
73# undef CORO_STACKGUARD
74#endif
75
76#ifndef CORO_STACKGUARD
77# define CORO_STACKGUARD 0
78#endif 75#endif
79 76
80/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
101# if CORO_PTHREAD 98# if CORO_PTHREAD
102static void *coro_thx; 99static void *coro_thx;
103# endif 100# endif
104#endif 101#endif
105 102
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux 103#ifdef __linux
110# include <time.h> /* for timespec */ 104# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */ 105# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime 106# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 107# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
176typedef struct coro_cctx 170typedef struct coro_cctx
177{ 171{
178 struct coro_cctx *next; 172 struct coro_cctx *next;
179 173
180 /* the stack */ 174 /* the stack */
181 void *sptr; 175 struct coro_stack stack;
182 size_t ssize;
183 176
184 /* cpu state */ 177 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG 179#ifndef NDEBUG
187 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
213}; 206};
214 207
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 209typedef struct
217{ 210{
218#define VARx(name,expr,type) type name; 211 #define VARx(name,expr,type) type name;
219# include "state.h" 212 #include "state.h"
220#undef VARx
221} perl_slots; 213} perl_slots;
222 214
223/* how many context stack entries do we need for perl_slots */ 215/* how many context stack entries do we need for perl_slots */
224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
225 217
… …
256 SV *saved_deffh; 248 SV *saved_deffh;
257 SV *invoke_cb; 249 SV *invoke_cb;
258 AV *invoke_av; 250 AV *invoke_av;
259 251
260 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
261 AV *on_enter; 253 AV *on_enter; AV *on_enter_xs;
262 AV *on_leave; 254 AV *on_leave; AV *on_leave_xs;
263 255
264 /* swap_sv */ 256 /* swap_sv */
265 AV *swap_sv; 257 AV *swap_sv;
266 258
267 /* times */ 259 /* times */
… …
297#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
298 290
299/** JIT *********************************************************************/ 291/** JIT *********************************************************************/
300 292
301#if CORO_JIT 293#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */ 294 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE 296 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY 297 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix" 298 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY 299 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix" 300 #define CORO_JIT_TYPE "x86-unix"
309 #endif 301 #endif
310 #endif 302 #endif
311#endif 303#endif
312 304
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT 306 #undef CORO_JIT
315#endif 307#endif
316 308
317#if CORO_JIT 309#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *); 310 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
375time_init (pTHX) 367time_init (pTHX)
376{ 368{
377 SV **svp; 369 SV **svp;
378 370
379 require_pv ("Time/HiRes.pm"); 371 require_pv ("Time/HiRes.pm");
380 372
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382 374
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385 377
… …
503 495
504 return 0; 496 return 0;
505} 497}
506 498
507ecb_inline struct coro * 499ecb_inline struct coro *
508SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro_sv)
509{ 501{
510 MAGIC *mg; 502 MAGIC *mg;
511 503
512 if (SvROK (coro)) 504 if (SvROK (coro_sv))
513 coro = SvRV (coro); 505 coro_sv = SvRV (coro_sv);
514 506
515 mg = SvSTATEhv_p (aTHX_ coro); 507 mg = SvSTATEhv_p (aTHX_ coro_sv);
516 if (!mg) 508 if (!mg)
517 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
518 510
519 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
520} 512}
… …
526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
527 519
528/*****************************************************************************/ 520/*****************************************************************************/
529/* padlist management and caching */ 521/* padlist management and caching */
530 522
531ecb_inline AV * 523ecb_inline PADLIST *
532coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
533{ 525{
534 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
535 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
536 531
537 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
538 AvREAL_off (newpadlist); 560 AvREAL_off (newpadlist);
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
541#else
542 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
543#endif 561#endif
544 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
545 --AvFILLp (padlist);
546 562
547 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
548 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
549 571
550 return newpadlist; 572 return newpadlist;
551} 573}
552 574
553ecb_inline void 575ecb_inline void
554free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
555{ 577{
556 /* may be during global destruction */ 578 /* may be during global destruction */
557 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
558 { 580 {
559 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
560 582
561 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
562 { 584 {
563 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
564 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
565 I32 j = AvFILLp (av);
566 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
567 while (j >= 0) 592 while (j >= 0)
568 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
569 594
570 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
571 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
572 } 598 }
573 599
574 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
575 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
576 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
577 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
578 } 610 }
579} 611}
580 612
581static int 613static int
582coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
583{ 615{
584 AV *padlist; 616 PADLIST *padlist;
585 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
586 619
587 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
588 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
589 return 0; 622 return 0;
590 623
591 /* casting is fun. */ 624 while (len--)
592 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
593 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
594
595 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
596 626
597 return 0; 627 return 0;
598} 628}
599 629
600static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
… …
605/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
606ecb_inline void 636ecb_inline void
607get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
608{ 638{
609 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
610 AV *av; 640 size_t *lenp;
611 641
612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
614 else 644 else
615 { 645 {
616#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
617 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
618 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
628 658
629ecb_inline void 659ecb_inline void
630put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
631{ 661{
632 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
633 AV *av;
634 663
635 if (ecb_expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
637 674
638 av = (AV *)mg->mg_obj; 675 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
639
640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
641 av_extend (av, AvFILLp (av) + 1);
642
643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
644} 676}
645 677
646/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
647 679
648ecb_inline void 680ecb_inline void
… …
710 742
711#if CORO_JIT 743#if CORO_JIT
712 load_perl_slots (slot); 744 load_perl_slots (slot);
713#else 745#else
714 #define VARx(name,expr,type) expr = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
715 # include "state.h" 747 #include "state.h"
716 #undef VARx
717#endif 748#endif
718 749
719 { 750 {
720 dSP; 751 dSP;
721 752
… …
724 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
725 while (ecb_expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
726 { 757 {
727 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
728 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
729 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
730 } 761 }
731 762
732 PUTBACK; 763 PUTBACK;
733 } 764 }
734 765
… …
749 780
750 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
752 } 783 }
753 784
785 if (ecb_expect_false (c->on_enter_xs))
786 {
787 int i;
788
789 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
790 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
791 }
792
754 SWAP_SVS (c); 793 SWAP_SVS (c);
755} 794}
756 795
757static void 796static void
758save_perl (pTHX_ Coro__State c) 797save_perl (pTHX_ Coro__State c)
759{ 798{
760 SWAP_SVS (c); 799 SWAP_SVS (c);
800
801 if (ecb_expect_false (c->on_leave_xs))
802 {
803 int i;
804
805 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
806 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
807 }
761 808
762 if (ecb_expect_false (c->on_leave)) 809 if (ecb_expect_false (c->on_leave))
763 { 810 {
764 int i; 811 int i;
765 812
… …
843 890
844#if CORO_JIT 891#if CORO_JIT
845 save_perl_slots (slot); 892 save_perl_slots (slot);
846#else 893#else
847 #define VARx(name,expr,type) slot->name = expr; 894 #define VARx(name,expr,type) slot->name = expr;
848 # include "state.h" 895 #include "state.h"
849 #undef VARx
850#endif 896#endif
851 } 897 }
852} 898}
853 899
854/* 900/*
… …
998 { 1044 {
999 SV **svp = 0; 1045 SV **svp = 0;
1000 1046
1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1047 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1048 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1003 1049
1004 if (svp) 1050 if (svp)
1005 { 1051 {
1006 SV *ssv; 1052 SV *ssv;
1007 1053
1008 if (!*svp) 1054 if (!*svp)
… …
1114 PL_hints = 0; 1160 PL_hints = 0;
1115 1161
1116 /* recreate the die/warn hooks */ 1162 /* recreate the die/warn hooks */
1117 PL_diehook = SvREFCNT_inc (rv_diehook); 1163 PL_diehook = SvREFCNT_inc (rv_diehook);
1118 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1164 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1119 1165
1120 GvSV (PL_defgv) = newSV (0); 1166 GvSV (PL_defgv) = newSV (0);
1121 GvAV (PL_defgv) = coro->args; coro->args = 0; 1167 GvAV (PL_defgv) = coro->args; coro->args = 0;
1122 GvSV (PL_errgv) = newSV (0); 1168 GvSV (PL_errgv) = newSV (0);
1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1169 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1124 GvHV (PL_hintgv) = 0; 1170 GvHV (PL_hintgv) = newHV ();
1171#if PERL_VERSION_ATLEAST (5,10,0)
1172 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1173#endif
1125 PL_rs = newSVsv (GvSV (irsgv)); 1174 PL_rs = newSVsv (GvSV (irsgv));
1126 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1175 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1127 1176
1128 { 1177 {
1129 dSP; 1178 dSP;
… …
1239 1288
1240 SvREFCNT_dec (coro->saved_deffh); 1289 SvREFCNT_dec (coro->saved_deffh);
1241 SvREFCNT_dec (coro->rouse_cb); 1290 SvREFCNT_dec (coro->rouse_cb);
1242 SvREFCNT_dec (coro->invoke_cb); 1291 SvREFCNT_dec (coro->invoke_cb);
1243 SvREFCNT_dec (coro->invoke_av); 1292 SvREFCNT_dec (coro->invoke_av);
1293 SvREFCNT_dec (coro->on_enter_xs);
1294 SvREFCNT_dec (coro->on_leave_xs);
1244 } 1295 }
1245} 1296}
1246 1297
1247ecb_inline void 1298ecb_inline void
1248free_coro_mortal (pTHX) 1299free_coro_mortal (pTHX)
… …
1311 1362
1312 if (PL_curcop != &PL_compiling) 1363 if (PL_curcop != &PL_compiling)
1313 { 1364 {
1314 SV **cb; 1365 SV **cb;
1315 1366
1316 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1367 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1317 { 1368 {
1318 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1369 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1319 1370
1320 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1371 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1321 { 1372 {
… …
1417transfer_tail (pTHX) 1468transfer_tail (pTHX)
1418{ 1469{
1419 free_coro_mortal (aTHX); 1470 free_coro_mortal (aTHX);
1420} 1471}
1421 1472
1473/* try to exit the same way perl's main function would do */
1474/* we do not bother resetting the environment or other things *7
1475/* that are not, uhm, essential */
1476/* this obviously also doesn't work when perl is embedded */
1477static void ecb_noinline ecb_cold
1478perlish_exit (pTHX)
1479{
1480 int exitstatus = perl_destruct (PL_curinterp);
1481 perl_free (PL_curinterp);
1482 exit (exitstatus);
1483}
1484
1422/* 1485/*
1423 * this is a _very_ stripped down perl interpreter ;) 1486 * this is a _very_ stripped down perl interpreter ;)
1424 */ 1487 */
1425static void 1488static void
1426cctx_run (void *arg) 1489cctx_run (void *arg)
… …
1453 */ 1516 */
1454 1517
1455 /* 1518 /*
1456 * If perl-run returns we assume exit() was being called or the coro 1519 * If perl-run returns we assume exit() was being called or the coro
1457 * fell off the end, which seems to be the only valid (non-bug) 1520 * fell off the end, which seems to be the only valid (non-bug)
1458 * reason for perl_run to return. We try to exit by jumping to the 1521 * reason for perl_run to return. We try to mimic whatever perl is normally
1459 * bootstrap-time "top" top_env, as we cannot restore the "main" 1522 * doing in that case. YMMV.
1460 * coroutine as Coro has no such concept.
1461 * This actually isn't valid with the pthread backend, but OSes requiring
1462 * that backend are too broken to do it in a standards-compliant way.
1463 */ 1523 */
1464 PL_top_env = main_top_env; 1524 perlish_exit (aTHX);
1465 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1466 } 1525 }
1467} 1526}
1468 1527
1469static coro_cctx * 1528static coro_cctx *
1470cctx_new (void) 1529cctx_new (void)
… …
1485static coro_cctx * 1544static coro_cctx *
1486cctx_new_empty (void) 1545cctx_new_empty (void)
1487{ 1546{
1488 coro_cctx *cctx = cctx_new (); 1547 coro_cctx *cctx = cctx_new ();
1489 1548
1490 cctx->sptr = 0; 1549 cctx->stack.sptr = 0;
1491 coro_create (&cctx->cctx, 0, 0, 0, 0); 1550 coro_create (&cctx->cctx, 0, 0, 0, 0);
1492 1551
1493 return cctx; 1552 return cctx;
1494} 1553}
1495 1554
1496/* create a new cctx suitable as destination/running a perl interpreter */ 1555/* create a new cctx suitable as destination/running a perl interpreter */
1497static coro_cctx * 1556static coro_cctx *
1498cctx_new_run (void) 1557cctx_new_run (void)
1499{ 1558{
1500 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1501 void *stack_start;
1502 size_t stack_size;
1503 1560
1504#if HAVE_MMAP 1561 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1505 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1506 /* mmap supposedly does allocate-on-write for us */
1507 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1508
1509 if (cctx->sptr != (void *)-1)
1510 {
1511 #if CORO_STACKGUARD
1512 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1513 #endif
1514 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1515 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1516 cctx->flags |= CC_MAPPED;
1517 } 1562 {
1518 else
1519#endif
1520 {
1521 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1522 New (0, cctx->sptr, cctx_stacksize, long);
1523
1524 if (!cctx->sptr)
1525 {
1526 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1563 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1527 _exit (EXIT_FAILURE); 1564 _exit (EXIT_FAILURE);
1528 }
1529
1530 stack_start = cctx->sptr;
1531 stack_size = cctx->ssize;
1532 } 1565 }
1533 1566
1534 #if CORO_USE_VALGRIND
1535 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1536 #endif
1537
1538 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1567 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1539 1568
1540 return cctx; 1569 return cctx;
1541} 1570}
1542 1571
1543static void 1572static void
… …
1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1578 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1550 1579
1551 --cctx_count; 1580 --cctx_count;
1552 coro_destroy (&cctx->cctx); 1581 coro_destroy (&cctx->cctx);
1553 1582
1554 /* coro_transfer creates new, empty cctx's */ 1583 coro_stack_free (&cctx->stack);
1555 if (cctx->sptr)
1556 {
1557 #if CORO_USE_VALGRIND
1558 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1559 #endif
1560
1561#if HAVE_MMAP
1562 if (cctx->flags & CC_MAPPED)
1563 munmap (cctx->sptr, cctx->ssize);
1564 else
1565#endif
1566 Safefree (cctx->sptr);
1567 }
1568 1584
1569 Safefree (cctx); 1585 Safefree (cctx);
1570} 1586}
1571 1587
1572/* wether this cctx should be destructed */ 1588/* wether this cctx should be destructed */
… …
1591} 1607}
1592 1608
1593static void 1609static void
1594cctx_put (coro_cctx *cctx) 1610cctx_put (coro_cctx *cctx)
1595{ 1611{
1596 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1612 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1597 1613
1598 /* free another cctx if overlimit */ 1614 /* free another cctx if overlimit */
1599 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1615 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1600 { 1616 {
1601 coro_cctx *first = cctx_first; 1617 coro_cctx *first = cctx_first;
… …
1727 return; 1743 return;
1728 1744
1729 slf_destroy (aTHX_ coro); 1745 slf_destroy (aTHX_ coro);
1730 1746
1731 coro->flags |= CF_ZOMBIE; 1747 coro->flags |= CF_ZOMBIE;
1732 1748
1733 if (coro->flags & CF_READY) 1749 if (coro->flags & CF_READY)
1734 { 1750 {
1735 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1751 /* reduce nready, as destroying a ready coro effectively unreadies it */
1736 /* alternative: look through all ready queues and remove the coro */ 1752 /* alternative: look through all ready queues and remove the coro */
1737 --coro_nready; 1753 --coro_nready;
… …
1933 /* nothing to schedule: call the idle handler */ 1949 /* nothing to schedule: call the idle handler */
1934 if (SvROK (sv_idle) 1950 if (SvROK (sv_idle)
1935 && SvOBJECT (SvRV (sv_idle))) 1951 && SvOBJECT (SvRV (sv_idle)))
1936 { 1952 {
1937 if (SvRV (sv_idle) == SvRV (coro_current)) 1953 if (SvRV (sv_idle) == SvRV (coro_current))
1954 {
1955 require_pv ("Carp");
1956
1957 {
1958 dSP;
1959
1960 ENTER;
1961 SAVETMPS;
1962
1963 PUSHMARK (SP);
1938 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1964 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1965 PUTBACK;
1966 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1967
1968 FREETMPS;
1969 LEAVE;
1970 }
1971 }
1939 1972
1940 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1973 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1941 api_ready (aTHX_ SvRV (sv_idle)); 1974 api_ready (aTHX_ SvRV (sv_idle));
1942 --coro_nready; 1975 --coro_nready;
1943 } 1976 }
… …
2141 AV *od = coro->on_destroy; 2174 AV *od = coro->on_destroy;
2142 2175
2143 if (!od) 2176 if (!od)
2144 return; 2177 return;
2145 2178
2179 coro->on_destroy = 0;
2180 sv_2mortal ((SV *)od);
2181
2146 while (AvFILLp (od) >= 0) 2182 while (AvFILLp (od) >= 0)
2147 { 2183 {
2148 SV *cb = sv_2mortal (av_pop (od)); 2184 SV *cb = sv_2mortal (av_pop (od));
2149 2185
2150 /* coro hv's (and only hv's at the moment) are supported as well */ 2186 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2170 2206
2171static void 2207static void
2172coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2208coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2173{ 2209{
2174 AV *av; 2210 AV *av;
2175 2211
2176 if (coro->status) 2212 if (coro->status)
2177 { 2213 {
2178 av = coro->status; 2214 av = coro->status;
2179 av_clear (av); 2215 av_clear (av);
2180 } 2216 }
… …
2227 2263
2228 coro = SvSTATE (arg [0]); 2264 coro = SvSTATE (arg [0]);
2229 coro_hv = coro->hv; 2265 coro_hv = coro->hv;
2230 2266
2231 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2267 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2232 2268
2233 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2269 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2234 { 2270 {
2235 /* coro currently busy cancelling something, so just notify it */ 2271 /* coro currently busy cancelling something, so just notify it */
2236 coro->slf_frame.data = (void *)coro; 2272 coro->slf_frame.data = (void *)coro;
2237 2273
… …
2244 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2280 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2245 } 2281 }
2246 else 2282 else
2247 { 2283 {
2248 struct coro *self = SvSTATE_current; 2284 struct coro *self = SvSTATE_current;
2285
2286 if (!self)
2287 croak ("Coro::cancel called outside of thread content,");
2249 2288
2250 /* otherwise we cancel directly, purely for speed reasons 2289 /* otherwise we cancel directly, purely for speed reasons
2251 * unfortunately, this requires some magic trickery, as 2290 * unfortunately, this requires some magic trickery, as
2252 * somebody else could cancel us, so we have to fight the cancellation. 2291 * somebody else could cancel us, so we have to fight the cancellation.
2253 * this is ugly, and hopefully fully worth the extra speed. 2292 * this is ugly, and hopefully fully worth the extra speed.
… …
2416 2455
2417static int 2456static int
2418slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2457slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2419{ 2458{
2420 SV *data = (SV *)frame->data; 2459 SV *data = (SV *)frame->data;
2421 2460
2422 if (CORO_THROW) 2461 if (CORO_THROW)
2423 return 0; 2462 return 0;
2424 2463
2425 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2464 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2426 return 1; 2465 return 1;
… …
2462 cb = sv_2mortal (coro->rouse_cb); 2501 cb = sv_2mortal (coro->rouse_cb);
2463 coro->rouse_cb = 0; 2502 coro->rouse_cb = 0;
2464 } 2503 }
2465 2504
2466 if (!SvROK (cb) 2505 if (!SvROK (cb)
2467 || SvTYPE (SvRV (cb)) != SVt_PVCV 2506 || SvTYPE (SvRV (cb)) != SVt_PVCV
2468 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2507 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2469 croak ("Coro::rouse_wait called with illegal callback argument,"); 2508 croak ("Coro::rouse_wait called with illegal callback argument,");
2470 2509
2471 { 2510 {
2472 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2511 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2595 2634
2596/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2635/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2597static void 2636static void
2598slf_destroy (pTHX_ struct coro *coro) 2637slf_destroy (pTHX_ struct coro *coro)
2599{ 2638{
2600 /* this callback is reserved for slf functions needing to do cleanup */ 2639 struct CoroSLF frame = coro->slf_frame;
2601 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2602 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2603 2640
2604 /* 2641 /*
2605 * The on_destroy above most likely is from an SLF call. 2642 * The on_destroy below most likely is from an SLF call.
2606 * Since by definition the SLF call will not finish when we destroy 2643 * Since by definition the SLF call will not finish when we destroy
2607 * the coro, we will have to force-finish it here, otherwise 2644 * the coro, we will have to force-finish it here, otherwise
2608 * cleanup functions cannot call SLF functions. 2645 * cleanup functions cannot call SLF functions.
2609 */ 2646 */
2610 coro->slf_frame.prepare = 0; 2647 coro->slf_frame.prepare = 0;
2648
2649 /* this callback is reserved for slf functions needing to do cleanup */
2650 if (frame.destroy && frame.prepare && !PL_dirty)
2651 frame.destroy (aTHX_ &frame);
2611} 2652}
2612 2653
2613/* 2654/*
2614 * these not obviously related functions are all rolled into one 2655 * these not obviously related functions are all rolled into one
2615 * function to increase chances that they all will call transfer with the same 2656 * function to increase chances that they all will call transfer with the same
… …
2798static void 2839static void
2799coro_pop_on_leave (pTHX_ void *coro) 2840coro_pop_on_leave (pTHX_ void *coro)
2800{ 2841{
2801 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2842 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2802 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2843 on_enterleave_call (aTHX_ sv_2mortal (cb));
2844}
2845
2846static void
2847enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2848{
2849 if (!hook)
2850 return;
2851
2852 if (!*avp)
2853 {
2854 *avp = newAV ();
2855 AvREAL_off (*avp);
2856 }
2857
2858 av_push (*avp, (SV *)hook);
2859 av_push (*avp, (SV *)arg);
2860}
2861
2862static void
2863enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2864{
2865 AV *av = *avp;
2866 int i;
2867
2868 if (!av)
2869 return;
2870
2871 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2872 if (AvARRAY (av)[i] == (SV *)hook)
2873 {
2874 if (execute)
2875 hook ((void *)AvARRAY (av)[i + 1]);
2876
2877 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2878 av_pop (av);
2879 av_pop (av);
2880 break;
2881 }
2882
2883 if (AvFILLp (av) >= 0)
2884 {
2885 *avp = 0;
2886 SvREFCNT_dec_NN (av);
2887 }
2888}
2889
2890static void
2891api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2892{
2893 struct coro *coro = SvSTATE (coro_sv);
2894
2895 if (SvSTATE_current == coro)
2896 if (enter)
2897 enter (aTHX enter_arg);
2898
2899 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2900 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2901}
2902
2903static void
2904api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2905{
2906 struct coro *coro = SvSTATE (coro_sv);
2907
2908 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2909 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2910}
2911
2912static void
2913savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2914{
2915 struct coro *coro = SvSTATE_current;
2916
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2918}
2919
2920static void
2921savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2926}
2927
2928static void
2929api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2930{
2931 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2932
2933 /* this ought to be much cheaper than malloc + a single destructor call */
2934 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2935 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2803} 2936}
2804 2937
2805/*****************************************************************************/ 2938/*****************************************************************************/
2806/* PerlIO::cede */ 2939/* PerlIO::cede */
2807 2940
… …
2937 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3070 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2938 PUTBACK; 3071 PUTBACK;
2939 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3072 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2940 } 3073 }
2941 3074
2942 SvREFCNT_dec (cb); 3075 SvREFCNT_dec_NN (cb);
2943 } 3076 }
2944} 3077}
2945 3078
2946static void 3079static void
2947coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3080coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2955{ 3088{
2956 AV *av = (AV *)frame->data; 3089 AV *av = (AV *)frame->data;
2957 SV *count_sv = AvARRAY (av)[0]; 3090 SV *count_sv = AvARRAY (av)[0];
2958 SV *coro_hv = SvRV (coro_current); 3091 SV *coro_hv = SvRV (coro_current);
2959 3092
3093 frame->destroy = 0;
3094
2960 /* if we are about to throw, don't actually acquire the lock, just throw */ 3095 /* if we are about to throw, don't actually acquire the lock, just throw */
2961 if (CORO_THROW) 3096 if (ecb_expect_false (CORO_THROW))
3097 {
3098 /* we still might be responsible for the semaphore, so wake up others */
3099 coro_semaphore_adjust (aTHX_ av, 0);
3100
2962 return 0; 3101 return 0;
3102 }
2963 else if (SvIVX (count_sv) > 0) 3103 else if (SvIVX (count_sv) > 0)
2964 { 3104 {
2965 frame->destroy = 0;
2966
2967 if (acquire) 3105 if (acquire)
2968 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3106 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2969 else 3107 else
2970 coro_semaphore_adjust (aTHX_ av, 0); 3108 coro_semaphore_adjust (aTHX_ av, 0);
2971 3109
… …
3082 { 3220 {
3083 api_ready (aTHX_ cb); 3221 api_ready (aTHX_ cb);
3084 sv_setiv (cb, 0); /* signal waiter */ 3222 sv_setiv (cb, 0); /* signal waiter */
3085 } 3223 }
3086 3224
3087 SvREFCNT_dec (cb); 3225 SvREFCNT_dec_NN (cb);
3088 3226
3089 --count; 3227 --count;
3090 } 3228 }
3091} 3229}
3092 3230
… …
3177 } 3315 }
3178 3316
3179 av_push (state, data_sv); 3317 av_push (state, data_sv);
3180 3318
3181 api_ready (aTHX_ coro); 3319 api_ready (aTHX_ coro);
3182 SvREFCNT_dec (coro); 3320 SvREFCNT_dec_NN (coro);
3183 SvREFCNT_dec ((AV *)state); 3321 SvREFCNT_dec_NN ((AV *)state);
3184} 3322}
3185 3323
3186static int 3324static int
3187slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3325slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3188{ 3326{
… …
3193 /* it quickly returns */ 3331 /* it quickly returns */
3194 if (CORO_THROW) 3332 if (CORO_THROW)
3195 return 0; 3333 return 0;
3196 3334
3197 /* one element that is an RV? repeat! */ 3335 /* one element that is an RV? repeat! */
3198 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3336 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3199 return 1; 3337 return 1;
3200 3338
3201 /* restore status */ 3339 /* restore status */
3202 { 3340 {
3203 SV *data_sv = av_pop (state); 3341 SV *data_sv = av_pop (state);
… …
3206 errno = data->errorno; 3344 errno = data->errorno;
3207 PL_laststype = data->laststype; 3345 PL_laststype = data->laststype;
3208 PL_laststatval = data->laststatval; 3346 PL_laststatval = data->laststatval;
3209 PL_statcache = data->statcache; 3347 PL_statcache = data->statcache;
3210 3348
3211 SvREFCNT_dec (data_sv); 3349 SvREFCNT_dec_NN (data_sv);
3212 } 3350 }
3213 3351
3214 /* push result values */ 3352 /* push result values */
3215 { 3353 {
3216 dSP; 3354 dSP;
… …
3393 int count; 3531 int count;
3394 3532
3395 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3533 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3396 3534
3397 PUSHMARK (SP); 3535 PUSHMARK (SP);
3398#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3536 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3399# include "state.h" 3537 #include "state.h"
3400#undef VARx
3401 count = call_pv ("Coro::State::_jit", G_ARRAY); 3538 count = call_pv ("Coro::State::_jit", G_ARRAY);
3402 SPAGAIN; 3539 SPAGAIN;
3403 3540
3404 save = POPs; save_ptr = SvPVbyte (save, save_len); 3541 save = POPs; save_ptr = SvPVbyte (save, save_len);
3405 load = POPs; load_ptr = SvPVbyte (load, load_len); 3542 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3432 3569
3433PROTOTYPES: DISABLE 3570PROTOTYPES: DISABLE
3434 3571
3435BOOT: 3572BOOT:
3436{ 3573{
3574#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3575#include "state.h"
3437#ifdef USE_ITHREADS 3576#ifdef USE_ITHREADS
3438# if CORO_PTHREAD 3577# if CORO_PTHREAD
3439 coro_thx = PERL_GET_CONTEXT; 3578 coro_thx = PERL_GET_CONTEXT;
3440# endif 3579# endif
3441#endif 3580#endif
3442 BOOT_PAGESIZE;
3443
3444 /* perl defines these to check for existance first, but why it doesn't */ 3581 /* perl defines these to check for existance first, but why it doesn't */
3445 /* just create them one at init time is not clear to me, except for */ 3582 /* just create them one at init time is not clear to me, except for */
3446 /* programs trying to delete them, but... */ 3583 /* programs trying to delete them, but... */
3447 /* anyway, we declare this as invalid and make sure they are initialised here */ 3584 /* anyway, we declare this as invalid and make sure they are initialised here */
3448 DEFSV; 3585 DEFSV;
… …
3518void 3655void
3519transfer (...) 3656transfer (...)
3520 PROTOTYPE: $$ 3657 PROTOTYPE: $$
3521 CODE: 3658 CODE:
3522 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3659 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3523
3524void
3525_exit (int code)
3526 PROTOTYPE: $
3527 CODE:
3528 _exit (code);
3529 3660
3530SV * 3661SV *
3531clone (Coro::State coro) 3662clone (Coro::State coro)
3532 CODE: 3663 CODE:
3533{ 3664{
… …
3588void 3719void
3589list () 3720list ()
3590 PROTOTYPE: 3721 PROTOTYPE:
3591 PPCODE: 3722 PPCODE:
3592{ 3723{
3593 struct coro *coro; 3724 struct coro *coro;
3594 for (coro = coro_first; coro; coro = coro->next) 3725 for (coro = coro_first; coro; coro = coro->next)
3595 if (coro->hv) 3726 if (coro->hv)
3596 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3727 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3597} 3728}
3598 3729
… …
3662 RETVAL = boolSV (coro->flags & ix); 3793 RETVAL = boolSV (coro->flags & ix);
3663 OUTPUT: 3794 OUTPUT:
3664 RETVAL 3795 RETVAL
3665 3796
3666void 3797void
3667throw (Coro::State self, SV *exception = &PL_sv_undef) 3798throw (SV *self, SV *exception = &PL_sv_undef)
3668 PROTOTYPE: $;$ 3799 PROTOTYPE: $;$
3669 CODE: 3800 CODE:
3670{ 3801{
3802 struct coro *coro = SvSTATE (self);
3671 struct coro *current = SvSTATE_current; 3803 struct coro *current = SvSTATE_current;
3672 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3804 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3673 SvREFCNT_dec (*exceptionp); 3805 SvREFCNT_dec (*exceptionp);
3674 SvGETMAGIC (exception); 3806 SvGETMAGIC (exception);
3675 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3807 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3808
3809 api_ready (aTHX_ self);
3676} 3810}
3677 3811
3678void 3812void
3679api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3813api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3680 PROTOTYPE: $;$ 3814 PROTOTYPE: $;$
… …
3757 3891
3758void 3892void
3759times (Coro::State self) 3893times (Coro::State self)
3760 PPCODE: 3894 PPCODE:
3761{ 3895{
3762 struct coro *current = SvSTATE (coro_current); 3896 struct coro *current = SvSTATE (coro_current);
3763 3897
3764 if (ecb_expect_false (current == self)) 3898 if (ecb_expect_false (current == self))
3765 { 3899 {
3766 coro_times_update (); 3900 coro_times_update ();
3767 coro_times_add (SvSTATE (coro_current)); 3901 coro_times_add (SvSTATE (coro_current));
… …
3810 3944
3811 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3945 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3812 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3946 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3813 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3947 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3814 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3948 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3815 3949
3816 coro_stash = gv_stashpv ("Coro", TRUE); 3950 coro_stash = gv_stashpv ("Coro", TRUE);
3817 3951
3818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3952 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3953 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3820 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3954 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3832 coroapi.ready = api_ready; 3966 coroapi.ready = api_ready;
3833 coroapi.is_ready = api_is_ready; 3967 coroapi.is_ready = api_is_ready;
3834 coroapi.nready = coro_nready; 3968 coroapi.nready = coro_nready;
3835 coroapi.current = coro_current; 3969 coroapi.current = coro_current;
3836 3970
3971 coroapi.enterleave_hook = api_enterleave_hook;
3972 coroapi.enterleave_unhook = api_enterleave_unhook;
3973 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3974
3837 /*GCoroAPI = &coroapi;*/ 3975 /*GCoroAPI = &coroapi;*/
3838 sv_setiv (sv, (IV)&coroapi); 3976 sv_setiv (sv, (IV)&coroapi);
3839 SvREADONLY_on (sv); 3977 SvREADONLY_on (sv);
3840 } 3978 }
3841} 3979}
… …
3906 4044
3907void 4045void
3908_set_current (SV *current) 4046_set_current (SV *current)
3909 PROTOTYPE: $ 4047 PROTOTYPE: $
3910 CODE: 4048 CODE:
3911 SvREFCNT_dec (SvRV (coro_current)); 4049 SvREFCNT_dec_NN (SvRV (coro_current));
3912 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4050 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3913 4051
3914void 4052void
3915_set_readyhook (SV *hook) 4053_set_readyhook (SV *hook)
3916 PROTOTYPE: $ 4054 PROTOTYPE: $
… …
4000 4138
4001 if ((SV *)hv == &PL_sv_undef) 4139 if ((SV *)hv == &PL_sv_undef)
4002 { 4140 {
4003 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4141 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4004 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4142 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4005 SvREFCNT_dec (sv); 4143 SvREFCNT_dec_NN (sv);
4006 } 4144 }
4007 4145
4008 { 4146 {
4009 struct coro *coro = SvSTATE_hv (hv); 4147 struct coro *coro = SvSTATE_hv (hv);
4010 4148
… …
4017 api_ready (aTHX_ (SV *)hv); 4155 api_ready (aTHX_ (SV *)hv);
4018 4156
4019 if (GIMME_V != G_VOID) 4157 if (GIMME_V != G_VOID)
4020 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4158 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4021 else 4159 else
4022 SvREFCNT_dec (hv); 4160 SvREFCNT_dec_NN (hv);
4023} 4161}
4024 4162
4025SV * 4163SV *
4026rouse_cb () 4164rouse_cb ()
4027 PROTOTYPE: 4165 PROTOTYPE:
… …
4042 on_leave = 1 4180 on_leave = 1
4043 PROTOTYPE: & 4181 PROTOTYPE: &
4044 CODE: 4182 CODE:
4045{ 4183{
4046 struct coro *coro = SvSTATE_current; 4184 struct coro *coro = SvSTATE_current;
4047 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4185 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4048 4186
4049 block = s_get_cv_croak (block); 4187 block = s_get_cv_croak (block);
4050 4188
4051 if (!*avp) 4189 if (!*avp)
4052 *avp = newAV (); 4190 *avp = newAV ();
… …
4072 4210
4073SV * 4211SV *
4074new (SV *klass, SV *count = 0) 4212new (SV *klass, SV *count = 0)
4075 CODE: 4213 CODE:
4076{ 4214{
4077 int semcnt = 1; 4215 int semcnt = 1;
4078 4216
4079 if (count) 4217 if (count)
4080 { 4218 {
4081 SvGETMAGIC (count); 4219 SvGETMAGIC (count);
4082 4220
… …
4142 XSRETURN_NO; 4280 XSRETURN_NO;
4143} 4281}
4144 4282
4145void 4283void
4146waiters (SV *self) 4284waiters (SV *self)
4147 PPCODE: 4285 PPCODE:
4148{ 4286{
4149 AV *av = (AV *)SvRV (self); 4287 AV *av = (AV *)SvRV (self);
4150 int wcount = AvFILLp (av) + 1 - 1; 4288 int wcount = AvFILLp (av) + 1 - 1;
4151 4289
4152 if (GIMME_V == G_SCALAR) 4290 if (GIMME_V == G_SCALAR)
… …
4164 4302
4165void 4303void
4166_may_delete (SV *sem, int count, unsigned int extra_refs) 4304_may_delete (SV *sem, int count, unsigned int extra_refs)
4167 PPCODE: 4305 PPCODE:
4168{ 4306{
4169 AV *av = (AV *)SvRV (sem); 4307 AV *av = (AV *)SvRV (sem);
4170 4308
4171 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4309 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4172 && AvFILLp (av) == 0 /* no waiters, just count */ 4310 && AvFILLp (av) == 0 /* no waiters, just count */
4173 && SvIV (AvARRAY (av)[0]) == count) 4311 && SvIV (AvARRAY (av)[0]) == count)
4174 XSRETURN_YES; 4312 XSRETURN_YES;
… …
4195 4333
4196void 4334void
4197broadcast (SV *self) 4335broadcast (SV *self)
4198 CODE: 4336 CODE:
4199{ 4337{
4200 AV *av = (AV *)SvRV (self); 4338 AV *av = (AV *)SvRV (self);
4201 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4339 coro_signal_wake (aTHX_ av, AvFILLp (av));
4202} 4340}
4203 4341
4204void 4342void
4205send (SV *self) 4343send (SV *self)
… …
4213 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4351 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4214} 4352}
4215 4353
4216IV 4354IV
4217awaited (SV *self) 4355awaited (SV *self)
4218 CODE: 4356 CODE:
4219 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4357 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4220 OUTPUT: 4358 OUTPUT:
4221 RETVAL 4359 RETVAL
4222 4360
4223 4361
… …
4228 4366
4229void 4367void
4230_schedule (...) 4368_schedule (...)
4231 CODE: 4369 CODE:
4232{ 4370{
4233 static int incede; 4371 static int incede;
4234 4372
4235 api_cede_notself (aTHX); 4373 api_cede_notself (aTHX);
4236 4374
4237 ++incede; 4375 ++incede;
4238 while (coro_nready >= incede && api_cede (aTHX)) 4376 while (coro_nready >= incede && api_cede (aTHX))
… …
4282 { 4420 {
4283 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4421 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4284 coro_old_pp_sselect = 0; 4422 coro_old_pp_sselect = 0;
4285 } 4423 }
4286 4424
4425MODULE = Coro::State PACKAGE = Coro::Util
4426
4427void
4428_exit (int code)
4429 CODE:
4430 _exit (code);
4431
4432NV
4433time ()
4434 CODE:
4435 RETVAL = nvtime (aTHX);
4436 OUTPUT:
4437 RETVAL
4438
4439NV
4440gettimeofday ()
4441 PPCODE:
4442{
4443 UV tv [2];
4444 u2time (aTHX_ tv);
4445 EXTEND (SP, 2);
4446 PUSHs (sv_2mortal (newSVuv (tv [0])));
4447 PUSHs (sv_2mortal (newSVuv (tv [1])));
4448}
4449

Diff Legend

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