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.422 by root, Sat Oct 6 21:25:24 2012 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
… …
173typedef struct coro_cctx 170typedef struct coro_cctx
174{ 171{
175 struct coro_cctx *next; 172 struct coro_cctx *next;
176 173
177 /* the stack */ 174 /* the stack */
178 void *sptr; 175 struct coro_stack stack;
179 size_t ssize;
180 176
181 /* cpu state */ 177 /* cpu state */
182 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
183#ifndef NDEBUG 179#ifndef NDEBUG
184 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
252 SV *saved_deffh; 248 SV *saved_deffh;
253 SV *invoke_cb; 249 SV *invoke_cb;
254 AV *invoke_av; 250 AV *invoke_av;
255 251
256 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
257 AV *on_enter; 253 AV *on_enter; AV *on_enter_xs;
258 AV *on_leave; 254 AV *on_leave; AV *on_leave_xs;
259 255
260 /* swap_sv */ 256 /* swap_sv */
261 AV *swap_sv; 257 AV *swap_sv;
262 258
263 /* times */ 259 /* times */
… …
293#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
294 290
295/** JIT *********************************************************************/ 291/** JIT *********************************************************************/
296 292
297#if CORO_JIT 293#if CORO_JIT
298 /* APPLE doesn't have HAVE_MMAP though */ 294 /* APPLE doesn't have mmap though */
299 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
300 #ifndef CORO_JIT_TYPE 296 #ifndef CORO_JIT_TYPE
301 #if __x86_64 && CORO_JIT_UNIXY 297 #if ECB_AMD64 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "amd64-unix" 298 #define CORO_JIT_TYPE "amd64-unix"
303 #elif __i386 && CORO_JIT_UNIXY 299 #elif __i386 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "x86-unix" 300 #define CORO_JIT_TYPE "x86-unix"
305 #endif 301 #endif
306 #endif 302 #endif
307#endif 303#endif
308 304
309#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
310 #undef CORO_JIT 306 #undef CORO_JIT
311#endif 307#endif
312 308
313#if CORO_JIT 309#if CORO_JIT
314 typedef void (*load_save_perl_slots_type)(perl_slots *); 310 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
371time_init (pTHX) 367time_init (pTHX)
372{ 368{
373 SV **svp; 369 SV **svp;
374 370
375 require_pv ("Time/HiRes.pm"); 371 require_pv ("Time/HiRes.pm");
376 372
377 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
378 374
379 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
380 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");
381 377
… …
499 495
500 return 0; 496 return 0;
501} 497}
502 498
503ecb_inline struct coro * 499ecb_inline struct coro *
504SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro_sv)
505{ 501{
506 MAGIC *mg; 502 MAGIC *mg;
507 503
508 if (SvROK (coro)) 504 if (SvROK (coro_sv))
509 coro = SvRV (coro); 505 coro_sv = SvRV (coro_sv);
510 506
511 mg = SvSTATEhv_p (aTHX_ coro); 507 mg = SvSTATEhv_p (aTHX_ coro_sv);
512 if (!mg) 508 if (!mg)
513 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
514 510
515 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
516} 512}
… …
522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
523 519
524/*****************************************************************************/ 520/*****************************************************************************/
525/* padlist management and caching */ 521/* padlist management and caching */
526 522
527ecb_inline AV * 523ecb_inline PADLIST *
528coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
529{ 525{
530 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
531 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
532 531
533 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. */
534 AvREAL_off (newpadlist); 560 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 561#endif
540 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
541 --AvFILLp (padlist);
542 562
543 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
544 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;
545 571
546 return newpadlist; 572 return newpadlist;
547} 573}
548 574
549ecb_inline void 575ecb_inline void
550free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
551{ 577{
552 /* may be during global destruction */ 578 /* may be during global destruction */
553 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
554 { 580 {
555 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
556 582
557 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
558 { 584 {
559 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
560 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
561 I32 j = AvFILLp (av);
562 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
563 while (j >= 0) 592 while (j >= 0)
564 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
565 594
566 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
567 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
568 } 598 }
569 599
570 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
571 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
572 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
573 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
574 } 610 }
575} 611}
576 612
577static int 613static int
578coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
579{ 615{
580 AV *padlist; 616 PADLIST *padlist;
581 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;
582 619
583 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
584 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
585 return 0; 622 return 0;
586 623
587 /* casting is fun. */ 624 while (len--)
588 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
589 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
590
591 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
592 626
593 return 0; 627 return 0;
594} 628}
595 629
596static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
… …
601/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
602ecb_inline void 636ecb_inline void
603get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
604{ 638{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 640 size_t *lenp;
607 641
608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
610 else 644 else
611 { 645 {
612#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
613 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
614 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
624 658
625ecb_inline void 659ecb_inline void
626put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
627{ 661{
628 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
629 AV *av;
630 663
631 if (ecb_expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
632 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);
633 674
634 av = (AV *)mg->mg_obj; 675 ((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} 676}
641 677
642/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
643 679
644ecb_inline void 680ecb_inline void
… …
719 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
720 while (ecb_expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
721 { 757 {
722 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
723 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
724 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
725 } 761 }
726 762
727 PUTBACK; 763 PUTBACK;
728 } 764 }
729 765
… …
744 780
745 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
746 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
747 } 783 }
748 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
749 SWAP_SVS (c); 793 SWAP_SVS (c);
750} 794}
751 795
752static void 796static void
753save_perl (pTHX_ Coro__State c) 797save_perl (pTHX_ Coro__State c)
754{ 798{
755 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 }
756 808
757 if (ecb_expect_false (c->on_leave)) 809 if (ecb_expect_false (c->on_leave))
758 { 810 {
759 int i; 811 int i;
760 812
… …
992 { 1044 {
993 SV **svp = 0; 1045 SV **svp = 0;
994 1046
995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1047 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1048 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
997 1049
998 if (svp) 1050 if (svp)
999 { 1051 {
1000 SV *ssv; 1052 SV *ssv;
1001 1053
1002 if (!*svp) 1054 if (!*svp)
… …
1108 PL_hints = 0; 1160 PL_hints = 0;
1109 1161
1110 /* recreate the die/warn hooks */ 1162 /* recreate the die/warn hooks */
1111 PL_diehook = SvREFCNT_inc (rv_diehook); 1163 PL_diehook = SvREFCNT_inc (rv_diehook);
1112 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1164 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1113 1165
1114 GvSV (PL_defgv) = newSV (0); 1166 GvSV (PL_defgv) = newSV (0);
1115 GvAV (PL_defgv) = coro->args; coro->args = 0; 1167 GvAV (PL_defgv) = coro->args; coro->args = 0;
1116 GvSV (PL_errgv) = newSV (0); 1168 GvSV (PL_errgv) = newSV (0);
1117 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);
1118 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
1119 PL_rs = newSVsv (GvSV (irsgv)); 1174 PL_rs = newSVsv (GvSV (irsgv));
1120 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1175 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1121 1176
1122 { 1177 {
1123 dSP; 1178 dSP;
… …
1233 1288
1234 SvREFCNT_dec (coro->saved_deffh); 1289 SvREFCNT_dec (coro->saved_deffh);
1235 SvREFCNT_dec (coro->rouse_cb); 1290 SvREFCNT_dec (coro->rouse_cb);
1236 SvREFCNT_dec (coro->invoke_cb); 1291 SvREFCNT_dec (coro->invoke_cb);
1237 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);
1238 } 1295 }
1239} 1296}
1240 1297
1241ecb_inline void 1298ecb_inline void
1242free_coro_mortal (pTHX) 1299free_coro_mortal (pTHX)
… …
1305 1362
1306 if (PL_curcop != &PL_compiling) 1363 if (PL_curcop != &PL_compiling)
1307 { 1364 {
1308 SV **cb; 1365 SV **cb;
1309 1366
1310 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1367 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1311 { 1368 {
1312 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1369 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1313 1370
1314 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1371 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1315 { 1372 {
… …
1487static coro_cctx * 1544static coro_cctx *
1488cctx_new_empty (void) 1545cctx_new_empty (void)
1489{ 1546{
1490 coro_cctx *cctx = cctx_new (); 1547 coro_cctx *cctx = cctx_new ();
1491 1548
1492 cctx->sptr = 0; 1549 cctx->stack.sptr = 0;
1493 coro_create (&cctx->cctx, 0, 0, 0, 0); 1550 coro_create (&cctx->cctx, 0, 0, 0, 0);
1494 1551
1495 return cctx; 1552 return cctx;
1496} 1553}
1497 1554
1498/* create a new cctx suitable as destination/running a perl interpreter */ 1555/* create a new cctx suitable as destination/running a perl interpreter */
1499static coro_cctx * 1556static coro_cctx *
1500cctx_new_run (void) 1557cctx_new_run (void)
1501{ 1558{
1502 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1503 void *stack_start;
1504 size_t stack_size;
1505 1560
1506#if HAVE_MMAP 1561 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, -1, 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 } 1562 {
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."); 1563 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1529 _exit (EXIT_FAILURE); 1564 _exit (EXIT_FAILURE);
1530 }
1531
1532 stack_start = cctx->sptr;
1533 stack_size = cctx->ssize;
1534 } 1565 }
1535 1566
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); 1567 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1541 1568
1542 return cctx; 1569 return cctx;
1543} 1570}
1544 1571
1545static void 1572static void
… …
1551 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1578 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1552 1579
1553 --cctx_count; 1580 --cctx_count;
1554 coro_destroy (&cctx->cctx); 1581 coro_destroy (&cctx->cctx);
1555 1582
1556 /* coro_transfer creates new, empty cctx's */ 1583 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 1584
1571 Safefree (cctx); 1585 Safefree (cctx);
1572} 1586}
1573 1587
1574/* wether this cctx should be destructed */ 1588/* wether this cctx should be destructed */
… …
1593} 1607}
1594 1608
1595static void 1609static void
1596cctx_put (coro_cctx *cctx) 1610cctx_put (coro_cctx *cctx)
1597{ 1611{
1598 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));
1599 1613
1600 /* free another cctx if overlimit */ 1614 /* free another cctx if overlimit */
1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1615 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1602 { 1616 {
1603 coro_cctx *first = cctx_first; 1617 coro_cctx *first = cctx_first;
… …
1729 return; 1743 return;
1730 1744
1731 slf_destroy (aTHX_ coro); 1745 slf_destroy (aTHX_ coro);
1732 1746
1733 coro->flags |= CF_ZOMBIE; 1747 coro->flags |= CF_ZOMBIE;
1734 1748
1735 if (coro->flags & CF_READY) 1749 if (coro->flags & CF_READY)
1736 { 1750 {
1737 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1751 /* reduce nready, as destroying a ready coro effectively unreadies it */
1738 /* alternative: look through all ready queues and remove the coro */ 1752 /* alternative: look through all ready queues and remove the coro */
1739 --coro_nready; 1753 --coro_nready;
… …
1935 /* nothing to schedule: call the idle handler */ 1949 /* nothing to schedule: call the idle handler */
1936 if (SvROK (sv_idle) 1950 if (SvROK (sv_idle)
1937 && SvOBJECT (SvRV (sv_idle))) 1951 && SvOBJECT (SvRV (sv_idle)))
1938 { 1952 {
1939 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);
1940 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 }
1941 1972
1942 ++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 */
1943 api_ready (aTHX_ SvRV (sv_idle)); 1974 api_ready (aTHX_ SvRV (sv_idle));
1944 --coro_nready; 1975 --coro_nready;
1945 } 1976 }
… …
2143 AV *od = coro->on_destroy; 2174 AV *od = coro->on_destroy;
2144 2175
2145 if (!od) 2176 if (!od)
2146 return; 2177 return;
2147 2178
2179 coro->on_destroy = 0;
2180 sv_2mortal ((SV *)od);
2181
2148 while (AvFILLp (od) >= 0) 2182 while (AvFILLp (od) >= 0)
2149 { 2183 {
2150 SV *cb = sv_2mortal (av_pop (od)); 2184 SV *cb = sv_2mortal (av_pop (od));
2151 2185
2152 /* 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 */
… …
2172 2206
2173static void 2207static void
2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2208coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2175{ 2209{
2176 AV *av; 2210 AV *av;
2177 2211
2178 if (coro->status) 2212 if (coro->status)
2179 { 2213 {
2180 av = coro->status; 2214 av = coro->status;
2181 av_clear (av); 2215 av_clear (av);
2182 } 2216 }
… …
2229 2263
2230 coro = SvSTATE (arg [0]); 2264 coro = SvSTATE (arg [0]);
2231 coro_hv = coro->hv; 2265 coro_hv = coro->hv;
2232 2266
2233 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2267 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2234 2268
2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2269 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2236 { 2270 {
2237 /* coro currently busy cancelling something, so just notify it */ 2271 /* coro currently busy cancelling something, so just notify it */
2238 coro->slf_frame.data = (void *)coro; 2272 coro->slf_frame.data = (void *)coro;
2239 2273
… …
2246 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2280 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2247 } 2281 }
2248 else 2282 else
2249 { 2283 {
2250 struct coro *self = SvSTATE_current; 2284 struct coro *self = SvSTATE_current;
2285
2286 if (!self)
2287 croak ("Coro::cancel called outside of thread content,");
2251 2288
2252 /* otherwise we cancel directly, purely for speed reasons 2289 /* otherwise we cancel directly, purely for speed reasons
2253 * unfortunately, this requires some magic trickery, as 2290 * unfortunately, this requires some magic trickery, as
2254 * 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.
2255 * this is ugly, and hopefully fully worth the extra speed. 2292 * this is ugly, and hopefully fully worth the extra speed.
… …
2418 2455
2419static int 2456static int
2420slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2457slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2421{ 2458{
2422 SV *data = (SV *)frame->data; 2459 SV *data = (SV *)frame->data;
2423 2460
2424 if (CORO_THROW) 2461 if (CORO_THROW)
2425 return 0; 2462 return 0;
2426 2463
2427 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2464 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2428 return 1; 2465 return 1;
… …
2464 cb = sv_2mortal (coro->rouse_cb); 2501 cb = sv_2mortal (coro->rouse_cb);
2465 coro->rouse_cb = 0; 2502 coro->rouse_cb = 0;
2466 } 2503 }
2467 2504
2468 if (!SvROK (cb) 2505 if (!SvROK (cb)
2469 || SvTYPE (SvRV (cb)) != SVt_PVCV 2506 || SvTYPE (SvRV (cb)) != SVt_PVCV
2470 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2507 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2471 croak ("Coro::rouse_wait called with illegal callback argument,"); 2508 croak ("Coro::rouse_wait called with illegal callback argument,");
2472 2509
2473 { 2510 {
2474 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2511 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2597 2634
2598/* "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 */
2599static void 2636static void
2600slf_destroy (pTHX_ struct coro *coro) 2637slf_destroy (pTHX_ struct coro *coro)
2601{ 2638{
2602 /* this callback is reserved for slf functions needing to do cleanup */ 2639 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 2640
2606 /* 2641 /*
2607 * The on_destroy above most likely is from an SLF call. 2642 * The on_destroy below most likely is from an SLF call.
2608 * 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
2609 * the coro, we will have to force-finish it here, otherwise 2644 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions. 2645 * cleanup functions cannot call SLF functions.
2611 */ 2646 */
2612 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);
2613} 2652}
2614 2653
2615/* 2654/*
2616 * these not obviously related functions are all rolled into one 2655 * these not obviously related functions are all rolled into one
2617 * 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
… …
2800static void 2839static void
2801coro_pop_on_leave (pTHX_ void *coro) 2840coro_pop_on_leave (pTHX_ void *coro)
2802{ 2841{
2803 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);
2804 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);
2805} 2936}
2806 2937
2807/*****************************************************************************/ 2938/*****************************************************************************/
2808/* PerlIO::cede */ 2939/* PerlIO::cede */
2809 2940
… …
2939 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3070 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2940 PUTBACK; 3071 PUTBACK;
2941 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3072 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2942 } 3073 }
2943 3074
2944 SvREFCNT_dec (cb); 3075 SvREFCNT_dec_NN (cb);
2945 } 3076 }
2946} 3077}
2947 3078
2948static void 3079static void
2949coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3080coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2957{ 3088{
2958 AV *av = (AV *)frame->data; 3089 AV *av = (AV *)frame->data;
2959 SV *count_sv = AvARRAY (av)[0]; 3090 SV *count_sv = AvARRAY (av)[0];
2960 SV *coro_hv = SvRV (coro_current); 3091 SV *coro_hv = SvRV (coro_current);
2961 3092
3093 frame->destroy = 0;
3094
2962 /* 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 */
2963 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
2964 return 0; 3101 return 0;
3102 }
2965 else if (SvIVX (count_sv) > 0) 3103 else if (SvIVX (count_sv) > 0)
2966 { 3104 {
2967 frame->destroy = 0;
2968
2969 if (acquire) 3105 if (acquire)
2970 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3106 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2971 else 3107 else
2972 coro_semaphore_adjust (aTHX_ av, 0); 3108 coro_semaphore_adjust (aTHX_ av, 0);
2973 3109
… …
3084 { 3220 {
3085 api_ready (aTHX_ cb); 3221 api_ready (aTHX_ cb);
3086 sv_setiv (cb, 0); /* signal waiter */ 3222 sv_setiv (cb, 0); /* signal waiter */
3087 } 3223 }
3088 3224
3089 SvREFCNT_dec (cb); 3225 SvREFCNT_dec_NN (cb);
3090 3226
3091 --count; 3227 --count;
3092 } 3228 }
3093} 3229}
3094 3230
… …
3179 } 3315 }
3180 3316
3181 av_push (state, data_sv); 3317 av_push (state, data_sv);
3182 3318
3183 api_ready (aTHX_ coro); 3319 api_ready (aTHX_ coro);
3184 SvREFCNT_dec (coro); 3320 SvREFCNT_dec_NN (coro);
3185 SvREFCNT_dec ((AV *)state); 3321 SvREFCNT_dec_NN ((AV *)state);
3186} 3322}
3187 3323
3188static int 3324static int
3189slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3325slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3190{ 3326{
… …
3195 /* it quickly returns */ 3331 /* it quickly returns */
3196 if (CORO_THROW) 3332 if (CORO_THROW)
3197 return 0; 3333 return 0;
3198 3334
3199 /* one element that is an RV? repeat! */ 3335 /* one element that is an RV? repeat! */
3200 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3336 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3201 return 1; 3337 return 1;
3202 3338
3203 /* restore status */ 3339 /* restore status */
3204 { 3340 {
3205 SV *data_sv = av_pop (state); 3341 SV *data_sv = av_pop (state);
… …
3208 errno = data->errorno; 3344 errno = data->errorno;
3209 PL_laststype = data->laststype; 3345 PL_laststype = data->laststype;
3210 PL_laststatval = data->laststatval; 3346 PL_laststatval = data->laststatval;
3211 PL_statcache = data->statcache; 3347 PL_statcache = data->statcache;
3212 3348
3213 SvREFCNT_dec (data_sv); 3349 SvREFCNT_dec_NN (data_sv);
3214 } 3350 }
3215 3351
3216 /* push result values */ 3352 /* push result values */
3217 { 3353 {
3218 dSP; 3354 dSP;
… …
3433 3569
3434PROTOTYPES: DISABLE 3570PROTOTYPES: DISABLE
3435 3571
3436BOOT: 3572BOOT:
3437{ 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"
3438#ifdef USE_ITHREADS 3576#ifdef USE_ITHREADS
3439# if CORO_PTHREAD 3577# if CORO_PTHREAD
3440 coro_thx = PERL_GET_CONTEXT; 3578 coro_thx = PERL_GET_CONTEXT;
3441# endif 3579# endif
3442#endif 3580#endif
3443 BOOT_PAGESIZE;
3444
3445 /* 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 */
3446 /* 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 */
3447 /* programs trying to delete them, but... */ 3583 /* programs trying to delete them, but... */
3448 /* 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 */
3449 DEFSV; 3585 DEFSV;
… …
3519void 3655void
3520transfer (...) 3656transfer (...)
3521 PROTOTYPE: $$ 3657 PROTOTYPE: $$
3522 CODE: 3658 CODE:
3523 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3659 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3524
3525void
3526_exit (int code)
3527 PROTOTYPE: $
3528 CODE:
3529 _exit (code);
3530 3660
3531SV * 3661SV *
3532clone (Coro::State coro) 3662clone (Coro::State coro)
3533 CODE: 3663 CODE:
3534{ 3664{
… …
3589void 3719void
3590list () 3720list ()
3591 PROTOTYPE: 3721 PROTOTYPE:
3592 PPCODE: 3722 PPCODE:
3593{ 3723{
3594 struct coro *coro; 3724 struct coro *coro;
3595 for (coro = coro_first; coro; coro = coro->next) 3725 for (coro = coro_first; coro; coro = coro->next)
3596 if (coro->hv) 3726 if (coro->hv)
3597 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3727 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3598} 3728}
3599 3729
… …
3761 3891
3762void 3892void
3763times (Coro::State self) 3893times (Coro::State self)
3764 PPCODE: 3894 PPCODE:
3765{ 3895{
3766 struct coro *current = SvSTATE (coro_current); 3896 struct coro *current = SvSTATE (coro_current);
3767 3897
3768 if (ecb_expect_false (current == self)) 3898 if (ecb_expect_false (current == self))
3769 { 3899 {
3770 coro_times_update (); 3900 coro_times_update ();
3771 coro_times_add (SvSTATE (coro_current)); 3901 coro_times_add (SvSTATE (coro_current));
… …
3814 3944
3815 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);
3816 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3946 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3817 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);
3818 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 */
3819 3949
3820 coro_stash = gv_stashpv ("Coro", TRUE); 3950 coro_stash = gv_stashpv ("Coro", TRUE);
3821 3951
3822 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3952 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3823 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3953 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3824 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3954 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3836 coroapi.ready = api_ready; 3966 coroapi.ready = api_ready;
3837 coroapi.is_ready = api_is_ready; 3967 coroapi.is_ready = api_is_ready;
3838 coroapi.nready = coro_nready; 3968 coroapi.nready = coro_nready;
3839 coroapi.current = coro_current; 3969 coroapi.current = coro_current;
3840 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
3841 /*GCoroAPI = &coroapi;*/ 3975 /*GCoroAPI = &coroapi;*/
3842 sv_setiv (sv, (IV)&coroapi); 3976 sv_setiv (sv, (IV)&coroapi);
3843 SvREADONLY_on (sv); 3977 SvREADONLY_on (sv);
3844 } 3978 }
3845} 3979}
… …
3910 4044
3911void 4045void
3912_set_current (SV *current) 4046_set_current (SV *current)
3913 PROTOTYPE: $ 4047 PROTOTYPE: $
3914 CODE: 4048 CODE:
3915 SvREFCNT_dec (SvRV (coro_current)); 4049 SvREFCNT_dec_NN (SvRV (coro_current));
3916 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4050 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3917 4051
3918void 4052void
3919_set_readyhook (SV *hook) 4053_set_readyhook (SV *hook)
3920 PROTOTYPE: $ 4054 PROTOTYPE: $
… …
4004 4138
4005 if ((SV *)hv == &PL_sv_undef) 4139 if ((SV *)hv == &PL_sv_undef)
4006 { 4140 {
4007 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);
4008 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4142 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4009 SvREFCNT_dec (sv); 4143 SvREFCNT_dec_NN (sv);
4010 } 4144 }
4011 4145
4012 { 4146 {
4013 struct coro *coro = SvSTATE_hv (hv); 4147 struct coro *coro = SvSTATE_hv (hv);
4014 4148
… …
4021 api_ready (aTHX_ (SV *)hv); 4155 api_ready (aTHX_ (SV *)hv);
4022 4156
4023 if (GIMME_V != G_VOID) 4157 if (GIMME_V != G_VOID)
4024 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4158 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4025 else 4159 else
4026 SvREFCNT_dec (hv); 4160 SvREFCNT_dec_NN (hv);
4027} 4161}
4028 4162
4029SV * 4163SV *
4030rouse_cb () 4164rouse_cb ()
4031 PROTOTYPE: 4165 PROTOTYPE:
… …
4046 on_leave = 1 4180 on_leave = 1
4047 PROTOTYPE: & 4181 PROTOTYPE: &
4048 CODE: 4182 CODE:
4049{ 4183{
4050 struct coro *coro = SvSTATE_current; 4184 struct coro *coro = SvSTATE_current;
4051 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4185 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4052 4186
4053 block = s_get_cv_croak (block); 4187 block = s_get_cv_croak (block);
4054 4188
4055 if (!*avp) 4189 if (!*avp)
4056 *avp = newAV (); 4190 *avp = newAV ();
… …
4076 4210
4077SV * 4211SV *
4078new (SV *klass, SV *count = 0) 4212new (SV *klass, SV *count = 0)
4079 CODE: 4213 CODE:
4080{ 4214{
4081 int semcnt = 1; 4215 int semcnt = 1;
4082 4216
4083 if (count) 4217 if (count)
4084 { 4218 {
4085 SvGETMAGIC (count); 4219 SvGETMAGIC (count);
4086 4220
… …
4146 XSRETURN_NO; 4280 XSRETURN_NO;
4147} 4281}
4148 4282
4149void 4283void
4150waiters (SV *self) 4284waiters (SV *self)
4151 PPCODE: 4285 PPCODE:
4152{ 4286{
4153 AV *av = (AV *)SvRV (self); 4287 AV *av = (AV *)SvRV (self);
4154 int wcount = AvFILLp (av) + 1 - 1; 4288 int wcount = AvFILLp (av) + 1 - 1;
4155 4289
4156 if (GIMME_V == G_SCALAR) 4290 if (GIMME_V == G_SCALAR)
… …
4168 4302
4169void 4303void
4170_may_delete (SV *sem, int count, unsigned int extra_refs) 4304_may_delete (SV *sem, int count, unsigned int extra_refs)
4171 PPCODE: 4305 PPCODE:
4172{ 4306{
4173 AV *av = (AV *)SvRV (sem); 4307 AV *av = (AV *)SvRV (sem);
4174 4308
4175 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4309 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4176 && AvFILLp (av) == 0 /* no waiters, just count */ 4310 && AvFILLp (av) == 0 /* no waiters, just count */
4177 && SvIV (AvARRAY (av)[0]) == count) 4311 && SvIV (AvARRAY (av)[0]) == count)
4178 XSRETURN_YES; 4312 XSRETURN_YES;
… …
4199 4333
4200void 4334void
4201broadcast (SV *self) 4335broadcast (SV *self)
4202 CODE: 4336 CODE:
4203{ 4337{
4204 AV *av = (AV *)SvRV (self); 4338 AV *av = (AV *)SvRV (self);
4205 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4339 coro_signal_wake (aTHX_ av, AvFILLp (av));
4206} 4340}
4207 4341
4208void 4342void
4209send (SV *self) 4343send (SV *self)
… …
4217 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4351 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4218} 4352}
4219 4353
4220IV 4354IV
4221awaited (SV *self) 4355awaited (SV *self)
4222 CODE: 4356 CODE:
4223 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4357 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4224 OUTPUT: 4358 OUTPUT:
4225 RETVAL 4359 RETVAL
4226 4360
4227 4361
… …
4232 4366
4233void 4367void
4234_schedule (...) 4368_schedule (...)
4235 CODE: 4369 CODE:
4236{ 4370{
4237 static int incede; 4371 static int incede;
4238 4372
4239 api_cede_notself (aTHX); 4373 api_cede_notself (aTHX);
4240 4374
4241 ++incede; 4375 ++incede;
4242 while (coro_nready >= incede && api_cede (aTHX)) 4376 while (coro_nready >= incede && api_cede (aTHX))
… …
4286 { 4420 {
4287 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4421 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4288 coro_old_pp_sselect = 0; 4422 coro_old_pp_sselect = 0;
4289 } 4423 }
4290 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