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.415 by root, Tue Aug 30 07:48:53 2011 UTC vs.
Revision 1.455 by root, Sun Oct 4 13:07:55 2015 UTC

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

Diff Legend

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