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.414 by root, Wed Jun 29 16:08:31 2011 UTC vs.
Revision 1.437 by root, Tue Nov 5 15:13:42 2013 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
17#include "ecb.h" 19#include "ecb.h"
18 20
19#include <stddef.h> 21#include <stddef.h>
20#include <stdio.h> 22#include <stdio.h>
21#include <errno.h> 23#include <errno.h>
22#include <assert.h> 24#include <assert.h>
23 25
24#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
26#endif 51#endif
27 52
28#if defined(_WIN32) 53#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 54# undef HAS_GETTIMEOFDAY
30# undef setjmp 55# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
34#else 59#else
35# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
36#endif 61#endif
37 62
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 */ 63/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
67 65
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 67# 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 68#endif
79 69
80/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
101# if CORO_PTHREAD 91# if CORO_PTHREAD
102static void *coro_thx; 92static void *coro_thx;
103# endif 93# endif
104#endif 94#endif
105 95
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux 96#ifdef __linux
110# include <time.h> /* for timespec */ 97# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */ 98# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime 99# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 100# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
176typedef struct coro_cctx 163typedef struct coro_cctx
177{ 164{
178 struct coro_cctx *next; 165 struct coro_cctx *next;
179 166
180 /* the stack */ 167 /* the stack */
181 void *sptr; 168 struct coro_stack stack;
182 size_t ssize;
183 169
184 /* cpu state */ 170 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
187 JMPENV *top_env; 175 JMPENV *top_env;
188 coro_context cctx; 176 coro_context cctx;
189 177
190 U32 gen; 178 U32 gen;
191#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
… …
211}; 199};
212 200
213/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
214typedef struct 202typedef struct
215{ 203{
216#define VARx(name,expr,type) type name; 204 #define VARx(name,expr,type) type name;
217# include "state.h" 205 #include "state.h"
218#undef VARx
219} perl_slots; 206} perl_slots;
220 207
221/* how many context stack entries do we need for perl_slots */ 208/* 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)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 210
… …
295#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
296 283
297/** JIT *********************************************************************/ 284/** JIT *********************************************************************/
298 285
299#if CORO_JIT 286#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */ 287 /* APPLE doesn't have mmap though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE 289 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY 290 #if ECB_AMD64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix" 291 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY 292 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix" 293 #define CORO_JIT_TYPE "x86-unix"
307 #endif 294 #endif
308 #endif 295 #endif
309#endif 296#endif
310 297
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
312 #undef CORO_JIT 299 #undef CORO_JIT
313#endif 300#endif
314 301
315#if CORO_JIT 302#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *); 303 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
373time_init (pTHX) 360time_init (pTHX)
374{ 361{
375 SV **svp; 362 SV **svp;
376 363
377 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
378 365
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380 367
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383 370
… …
524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
525 512
526/*****************************************************************************/ 513/*****************************************************************************/
527/* padlist management and caching */ 514/* padlist management and caching */
528 515
529ecb_inline AV * 516ecb_inline PADLIST *
530coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
531{ 518{
532 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
533 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
534 523
535 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
536 AvREAL_off (newpadlist); 552 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 553#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
543 --AvFILLp (padlist);
544 554
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
546 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
547 559
548 return newpadlist; 560 return newpadlist;
549} 561}
550 562
551ecb_inline void 563ecb_inline void
552free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
553{ 565{
554 /* may be during global destruction */ 566 /* may be during global destruction */
555 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
556 { 568 {
557 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
558 570
559 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
560 { 572 {
561 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av); 575 I32 j = PadMAX (pad);
564 576
565 while (j >= 0) 577 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 578 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 579
568 AvFILLp (av) = -1; 580 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 581 SvREFCNT_dec (pad);
570 } 582 }
571 583
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 584 SvREFCNT_dec (PadlistNAMES (padlist));
573 585
586#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist);
589#else
574 AvFILLp (padlist) = -1; 590 AvFILLp (padlist) = -1;
591 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 592 SvREFCNT_dec ((SV*)padlist);
593#endif
576 } 594 }
577} 595}
578 596
579static int 597static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 598coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 599{
582 AV *padlist; 600 PADLIST *padlist;
583 AV *av = (AV *)mg->mg_obj; 601 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
602 size_t len = *(size_t *)mg->mg_ptr;
584 603
585 /* perl manages to free our internal AV and _then_ call us */ 604 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 605 if (IN_DESTRUCT)
587 return 0; 606 return 0;
588 607
589 /* casting is fun. */ 608 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 609 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 610
595 return 0; 611 return 0;
596} 612}
597 613
598static MGVTBL coro_cv_vtbl = { 614static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 619/* the next two functions merely cache the padlists */
604ecb_inline void 620ecb_inline void
605get_padlist (pTHX_ CV *cv) 621get_padlist (pTHX_ CV *cv)
606{ 622{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 624 size_t *lenp;
609 625
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 626 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 627 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 628 else
613 { 629 {
614#if CORO_PREFER_PERL_FUNCTIONS 630#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 631 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 632 /* in practise, it seems to be less stable */
… …
626 642
627ecb_inline void 643ecb_inline void
628put_padlist (pTHX_ CV *cv) 644put_padlist (pTHX_ CV *cv)
629{ 645{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 647
633 if (ecb_expect_false (!mg)) 648 if (ecb_expect_false (!mg))
649 {
634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 650 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
651 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
652 mg->mg_len = 1; /* so mg_free frees mg_ptr */
653 }
654 else
655 Renew (mg->mg_ptr,
656 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
657 char);
635 658
636 av = (AV *)mg->mg_obj; 659 ((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} 660}
643 661
644/** load & save, init *******************************************************/ 662/** load & save, init *******************************************************/
645 663
664ecb_inline void
665swap_sv (SV *a, SV *b)
666{
667 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
668 SV tmp;
669
670 /* swap sv_any */
671 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
672
673 /* swap sv_flags */
674 SvFLAGS (&tmp) = SvFLAGS (a);
675 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
676 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
677
678#if PERL_VERSION_ATLEAST (5,10,0)
679 /* perl 5.10 and later complicates this _quite_ a bit, but it also
680 * is much faster, so no quarrels here. alternatively, we could
681 * sv_upgrade to avoid this.
682 */
683 {
684 /* swap sv_u */
685 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
686
687 /* if SvANY points to the head, we need to adjust the pointers,
688 * as the pointer for a still points to b, and maybe vice versa.
689 */
690 #define svany_in_head(type) \
691 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
692
693 if (svany_in_head (SvTYPE (a)))
694 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
695
696 if (svany_in_head (SvTYPE (b)))
697 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
698 }
699#endif
700}
701
646/* swap sv heads, at least logically */ 702/* swap sv heads, at least logically */
647static void 703static void
648swap_svs (pTHX_ Coro__State c) 704swap_svs (pTHX_ Coro__State c)
649{ 705{
650 int i; 706 int i;
651 707
652 for (i = 0; i <= AvFILLp (c->swap_sv); ) 708 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
653 { 709 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} 710}
692 711
693#define SWAP_SVS(coro) \ 712#define SWAP_SVS(coro) \
694 if (ecb_expect_false ((coro)->swap_sv)) \ 713 if (ecb_expect_false ((coro)->swap_sv)) \
695 swap_svs (aTHX_ (coro)) 714 swap_svs (aTHX_ (coro))
… …
707 726
708#if CORO_JIT 727#if CORO_JIT
709 load_perl_slots (slot); 728 load_perl_slots (slot);
710#else 729#else
711 #define VARx(name,expr,type) expr = slot->name; 730 #define VARx(name,expr,type) expr = slot->name;
712 # include "state.h" 731 #include "state.h"
713 #undef VARx
714#endif 732#endif
715 733
716 { 734 {
717 dSP; 735 dSP;
718 736
… …
721 /* now do the ugly restore mess */ 739 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 740 while (ecb_expect_true (cv = (CV *)POPs))
723 { 741 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 742 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 743 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 744 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 745 }
728 746
729 PUTBACK; 747 PUTBACK;
730 } 748 }
731 749
… …
840 858
841#if CORO_JIT 859#if CORO_JIT
842 save_perl_slots (slot); 860 save_perl_slots (slot);
843#else 861#else
844 #define VARx(name,expr,type) slot->name = expr; 862 #define VARx(name,expr,type) slot->name = expr;
845 # include "state.h" 863 #include "state.h"
846 #undef VARx
847#endif 864#endif
848 } 865 }
849} 866}
850 867
851/* 868/*
… …
995 { 1012 {
996 SV **svp = 0; 1013 SV **svp = 0;
997 1014
998 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
999 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1000 1017
1001 if (svp) 1018 if (svp)
1002 { 1019 {
1003 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1020 SV *ssv;
1021
1022 if (!*svp)
1023 ssv = &PL_sv_undef;
1024 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1025 ssv = sv_2mortal (newRV_inc (*svp));
1026 else
1027 ssv = *svp;
1028
1029 sv_setsv (sv, ssv);
1004 return 0; 1030 return 0;
1005 } 1031 }
1006 } 1032 }
1007 1033
1008 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1102 PL_hints = 0; 1128 PL_hints = 0;
1103 1129
1104 /* recreate the die/warn hooks */ 1130 /* recreate the die/warn hooks */
1105 PL_diehook = SvREFCNT_inc (rv_diehook); 1131 PL_diehook = SvREFCNT_inc (rv_diehook);
1106 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1132 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1107 1133
1108 GvSV (PL_defgv) = newSV (0); 1134 GvSV (PL_defgv) = newSV (0);
1109 GvAV (PL_defgv) = coro->args; coro->args = 0; 1135 GvAV (PL_defgv) = coro->args; coro->args = 0;
1110 GvSV (PL_errgv) = newSV (0); 1136 GvSV (PL_errgv) = newSV (0);
1111 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1137 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1112 GvHV (PL_hintgv) = 0; 1138 GvHV (PL_hintgv) = 0;
… …
1405transfer_tail (pTHX) 1431transfer_tail (pTHX)
1406{ 1432{
1407 free_coro_mortal (aTHX); 1433 free_coro_mortal (aTHX);
1408} 1434}
1409 1435
1436/* try to exit the same way perl's main function would do */
1437/* we do not bother resetting the environment or other things *7
1438/* that are not, uhm, essential */
1439/* this obviously also doesn't work when perl is embedded */
1440static void ecb_noinline ecb_cold
1441perlish_exit (pTHX)
1442{
1443 int exitstatus = perl_destruct (PL_curinterp);
1444 perl_free (PL_curinterp);
1445 exit (exitstatus);
1446}
1447
1410/* 1448/*
1411 * this is a _very_ stripped down perl interpreter ;) 1449 * this is a _very_ stripped down perl interpreter ;)
1412 */ 1450 */
1413static void 1451static void
1414cctx_run (void *arg) 1452cctx_run (void *arg)
… …
1441 */ 1479 */
1442 1480
1443 /* 1481 /*
1444 * If perl-run returns we assume exit() was being called or the coro 1482 * If perl-run returns we assume exit() was being called or the coro
1445 * fell off the end, which seems to be the only valid (non-bug) 1483 * fell off the end, which seems to be the only valid (non-bug)
1446 * reason for perl_run to return. We try to exit by jumping to the 1484 * reason for perl_run to return. We try to mimic whatever perl is normally
1447 * bootstrap-time "top" top_env, as we cannot restore the "main" 1485 * doing in that case. YMMV.
1448 * coroutine as Coro has no such concept.
1449 * This actually isn't valid with the pthread backend, but OSes requiring
1450 * that backend are too broken to do it in a standards-compliant way.
1451 */ 1486 */
1452 PL_top_env = main_top_env; 1487 perlish_exit (aTHX);
1453 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1454 } 1488 }
1455} 1489}
1456 1490
1457static coro_cctx * 1491static coro_cctx *
1458cctx_new (void) 1492cctx_new (void)
… …
1473static coro_cctx * 1507static coro_cctx *
1474cctx_new_empty (void) 1508cctx_new_empty (void)
1475{ 1509{
1476 coro_cctx *cctx = cctx_new (); 1510 coro_cctx *cctx = cctx_new ();
1477 1511
1478 cctx->sptr = 0; 1512 cctx->stack.sptr = 0;
1479 coro_create (&cctx->cctx, 0, 0, 0, 0); 1513 coro_create (&cctx->cctx, 0, 0, 0, 0);
1480 1514
1481 return cctx; 1515 return cctx;
1482} 1516}
1483 1517
1484/* create a new cctx suitable as destination/running a perl interpreter */ 1518/* create a new cctx suitable as destination/running a perl interpreter */
1485static coro_cctx * 1519static coro_cctx *
1486cctx_new_run (void) 1520cctx_new_run (void)
1487{ 1521{
1488 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1489 void *stack_start;
1490 size_t stack_size;
1491 1523
1492#if HAVE_MMAP 1524 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1493 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1494 /* mmap supposedly does allocate-on-write for us */
1495 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1496
1497 if (cctx->sptr != (void *)-1)
1498 {
1499 #if CORO_STACKGUARD
1500 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1501 #endif
1502 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1503 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1504 cctx->flags |= CC_MAPPED;
1505 } 1525 {
1506 else
1507#endif
1508 {
1509 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1510 New (0, cctx->sptr, cctx_stacksize, long);
1511
1512 if (!cctx->sptr)
1513 {
1514 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1526 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1515 _exit (EXIT_FAILURE); 1527 _exit (EXIT_FAILURE);
1516 }
1517
1518 stack_start = cctx->sptr;
1519 stack_size = cctx->ssize;
1520 } 1528 }
1521 1529
1522 #if CORO_USE_VALGRIND
1523 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1524 #endif
1525
1526 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1530 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1527 1531
1528 return cctx; 1532 return cctx;
1529} 1533}
1530 1534
1531static void 1535static void
… …
1537 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1541 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1538 1542
1539 --cctx_count; 1543 --cctx_count;
1540 coro_destroy (&cctx->cctx); 1544 coro_destroy (&cctx->cctx);
1541 1545
1542 /* coro_transfer creates new, empty cctx's */ 1546 coro_stack_free (&cctx->stack);
1543 if (cctx->sptr)
1544 {
1545 #if CORO_USE_VALGRIND
1546 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1547 #endif
1548
1549#if HAVE_MMAP
1550 if (cctx->flags & CC_MAPPED)
1551 munmap (cctx->sptr, cctx->ssize);
1552 else
1553#endif
1554 Safefree (cctx->sptr);
1555 }
1556 1547
1557 Safefree (cctx); 1548 Safefree (cctx);
1558} 1549}
1559 1550
1560/* wether this cctx should be destructed */ 1551/* wether this cctx should be destructed */
… …
1579} 1570}
1580 1571
1581static void 1572static void
1582cctx_put (coro_cctx *cctx) 1573cctx_put (coro_cctx *cctx)
1583{ 1574{
1584 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1575 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1585 1576
1586 /* free another cctx if overlimit */ 1577 /* free another cctx if overlimit */
1587 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1578 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1588 { 1579 {
1589 coro_cctx *first = cctx_first; 1580 coro_cctx *first = cctx_first;
… …
1715 return; 1706 return;
1716 1707
1717 slf_destroy (aTHX_ coro); 1708 slf_destroy (aTHX_ coro);
1718 1709
1719 coro->flags |= CF_ZOMBIE; 1710 coro->flags |= CF_ZOMBIE;
1720 1711
1721 if (coro->flags & CF_READY) 1712 if (coro->flags & CF_READY)
1722 { 1713 {
1723 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1714 /* reduce nready, as destroying a ready coro effectively unreadies it */
1724 /* alternative: look through all ready queues and remove the coro */ 1715 /* alternative: look through all ready queues and remove the coro */
1725 --coro_nready; 1716 --coro_nready;
… …
2129 AV *od = coro->on_destroy; 2120 AV *od = coro->on_destroy;
2130 2121
2131 if (!od) 2122 if (!od)
2132 return; 2123 return;
2133 2124
2125 coro->on_destroy = 0;
2126 sv_2mortal ((SV *)od);
2127
2134 while (AvFILLp (od) >= 0) 2128 while (AvFILLp (od) >= 0)
2135 { 2129 {
2136 SV *cb = sv_2mortal (av_pop (od)); 2130 SV *cb = sv_2mortal (av_pop (od));
2137 2131
2138 /* coro hv's (and only hv's at the moment) are supported as well */ 2132 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2158 2152
2159static void 2153static void
2160coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2154coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2161{ 2155{
2162 AV *av; 2156 AV *av;
2163 2157
2164 if (coro->status) 2158 if (coro->status)
2165 { 2159 {
2166 av = coro->status; 2160 av = coro->status;
2167 av_clear (av); 2161 av_clear (av);
2168 } 2162 }
… …
2215 2209
2216 coro = SvSTATE (arg [0]); 2210 coro = SvSTATE (arg [0]);
2217 coro_hv = coro->hv; 2211 coro_hv = coro->hv;
2218 2212
2219 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2213 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2220 2214
2221 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2215 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2222 { 2216 {
2223 /* coro currently busy cancelling something, so just notify it */ 2217 /* coro currently busy cancelling something, so just notify it */
2224 coro->slf_frame.data = (void *)coro; 2218 coro->slf_frame.data = (void *)coro;
2225 2219
… …
2404 2398
2405static int 2399static int
2406slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2400slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2407{ 2401{
2408 SV *data = (SV *)frame->data; 2402 SV *data = (SV *)frame->data;
2409 2403
2410 if (CORO_THROW) 2404 if (CORO_THROW)
2411 return 0; 2405 return 0;
2412 2406
2413 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2407 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2414 return 1; 2408 return 1;
… …
2450 cb = sv_2mortal (coro->rouse_cb); 2444 cb = sv_2mortal (coro->rouse_cb);
2451 coro->rouse_cb = 0; 2445 coro->rouse_cb = 0;
2452 } 2446 }
2453 2447
2454 if (!SvROK (cb) 2448 if (!SvROK (cb)
2455 || SvTYPE (SvRV (cb)) != SVt_PVCV 2449 || SvTYPE (SvRV (cb)) != SVt_PVCV
2456 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2450 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2457 croak ("Coro::rouse_wait called with illegal callback argument,"); 2451 croak ("Coro::rouse_wait called with illegal callback argument,");
2458 2452
2459 { 2453 {
2460 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3181 /* it quickly returns */ 3175 /* it quickly returns */
3182 if (CORO_THROW) 3176 if (CORO_THROW)
3183 return 0; 3177 return 0;
3184 3178
3185 /* one element that is an RV? repeat! */ 3179 /* one element that is an RV? repeat! */
3186 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3180 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3187 return 1; 3181 return 1;
3188 3182
3189 /* restore status */ 3183 /* restore status */
3190 { 3184 {
3191 SV *data_sv = av_pop (state); 3185 SV *data_sv = av_pop (state);
… …
3381 int count; 3375 int count;
3382 3376
3383 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3377 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3384 3378
3385 PUSHMARK (SP); 3379 PUSHMARK (SP);
3386#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3380 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3387# include "state.h" 3381 #include "state.h"
3388#undef VARx
3389 count = call_pv ("Coro::State::_jit", G_ARRAY); 3382 count = call_pv ("Coro::State::_jit", G_ARRAY);
3390 SPAGAIN; 3383 SPAGAIN;
3391 3384
3392 save = POPs; save_ptr = SvPVbyte (save, save_len); 3385 save = POPs; save_ptr = SvPVbyte (save, save_len);
3393 load = POPs; load_ptr = SvPVbyte (load, load_len); 3386 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3425#ifdef USE_ITHREADS 3418#ifdef USE_ITHREADS
3426# if CORO_PTHREAD 3419# if CORO_PTHREAD
3427 coro_thx = PERL_GET_CONTEXT; 3420 coro_thx = PERL_GET_CONTEXT;
3428# endif 3421# endif
3429#endif 3422#endif
3430 BOOT_PAGESIZE;
3431
3432 /* perl defines these to check for existance first, but why it doesn't */ 3423 /* perl defines these to check for existance first, but why it doesn't */
3433 /* just create them one at init time is not clear to me, except for */ 3424 /* just create them one at init time is not clear to me, except for */
3434 /* programs trying to delete them, but... */ 3425 /* programs trying to delete them, but... */
3435 /* anyway, we declare this as invalid and make sure they are initialised here */ 3426 /* anyway, we declare this as invalid and make sure they are initialised here */
3436 DEFSV; 3427 DEFSV;
… …
3506void 3497void
3507transfer (...) 3498transfer (...)
3508 PROTOTYPE: $$ 3499 PROTOTYPE: $$
3509 CODE: 3500 CODE:
3510 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3501 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3511
3512void
3513_exit (int code)
3514 PROTOTYPE: $
3515 CODE:
3516 _exit (code);
3517 3502
3518SV * 3503SV *
3519clone (Coro::State coro) 3504clone (Coro::State coro)
3520 CODE: 3505 CODE:
3521{ 3506{
… …
3576void 3561void
3577list () 3562list ()
3578 PROTOTYPE: 3563 PROTOTYPE:
3579 PPCODE: 3564 PPCODE:
3580{ 3565{
3581 struct coro *coro; 3566 struct coro *coro;
3582 for (coro = coro_first; coro; coro = coro->next) 3567 for (coro = coro_first; coro; coro = coro->next)
3583 if (coro->hv) 3568 if (coro->hv)
3584 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3569 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3585} 3570}
3586 3571
… …
3650 RETVAL = boolSV (coro->flags & ix); 3635 RETVAL = boolSV (coro->flags & ix);
3651 OUTPUT: 3636 OUTPUT:
3652 RETVAL 3637 RETVAL
3653 3638
3654void 3639void
3655throw (Coro::State self, SV *exception = &PL_sv_undef) 3640throw (SV *self, SV *exception = &PL_sv_undef)
3656 PROTOTYPE: $;$ 3641 PROTOTYPE: $;$
3657 CODE: 3642 CODE:
3658{ 3643{
3644 struct coro *coro = SvSTATE (self);
3659 struct coro *current = SvSTATE_current; 3645 struct coro *current = SvSTATE_current;
3660 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3646 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3661 SvREFCNT_dec (*exceptionp); 3647 SvREFCNT_dec (*exceptionp);
3662 SvGETMAGIC (exception); 3648 SvGETMAGIC (exception);
3663 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3649 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3650
3651 api_ready (aTHX_ self);
3664} 3652}
3665 3653
3666void 3654void
3667api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3655api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3668 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
… …
3745 3733
3746void 3734void
3747times (Coro::State self) 3735times (Coro::State self)
3748 PPCODE: 3736 PPCODE:
3749{ 3737{
3750 struct coro *current = SvSTATE (coro_current); 3738 struct coro *current = SvSTATE (coro_current);
3751 3739
3752 if (ecb_expect_false (current == self)) 3740 if (ecb_expect_false (current == self))
3753 { 3741 {
3754 coro_times_update (); 3742 coro_times_update ();
3755 coro_times_add (SvSTATE (coro_current)); 3743 coro_times_add (SvSTATE (coro_current));
… …
3798 3786
3799 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3787 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3800 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3788 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3801 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3789 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3802 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3790 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3803 3791
3804 coro_stash = gv_stashpv ("Coro", TRUE); 3792 coro_stash = gv_stashpv ("Coro", TRUE);
3805 3793
3806 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3794 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3807 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3795 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3808 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3796 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4030 on_leave = 1 4018 on_leave = 1
4031 PROTOTYPE: & 4019 PROTOTYPE: &
4032 CODE: 4020 CODE:
4033{ 4021{
4034 struct coro *coro = SvSTATE_current; 4022 struct coro *coro = SvSTATE_current;
4035 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4023 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4036 4024
4037 block = s_get_cv_croak (block); 4025 block = s_get_cv_croak (block);
4038 4026
4039 if (!*avp) 4027 if (!*avp)
4040 *avp = newAV (); 4028 *avp = newAV ();
… …
4060 4048
4061SV * 4049SV *
4062new (SV *klass, SV *count = 0) 4050new (SV *klass, SV *count = 0)
4063 CODE: 4051 CODE:
4064{ 4052{
4065 int semcnt = 1; 4053 int semcnt = 1;
4066 4054
4067 if (count) 4055 if (count)
4068 { 4056 {
4069 SvGETMAGIC (count); 4057 SvGETMAGIC (count);
4070 4058
… …
4130 XSRETURN_NO; 4118 XSRETURN_NO;
4131} 4119}
4132 4120
4133void 4121void
4134waiters (SV *self) 4122waiters (SV *self)
4135 PPCODE: 4123 PPCODE:
4136{ 4124{
4137 AV *av = (AV *)SvRV (self); 4125 AV *av = (AV *)SvRV (self);
4138 int wcount = AvFILLp (av) + 1 - 1; 4126 int wcount = AvFILLp (av) + 1 - 1;
4139 4127
4140 if (GIMME_V == G_SCALAR) 4128 if (GIMME_V == G_SCALAR)
… …
4152 4140
4153void 4141void
4154_may_delete (SV *sem, int count, unsigned int extra_refs) 4142_may_delete (SV *sem, int count, unsigned int extra_refs)
4155 PPCODE: 4143 PPCODE:
4156{ 4144{
4157 AV *av = (AV *)SvRV (sem); 4145 AV *av = (AV *)SvRV (sem);
4158 4146
4159 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4147 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4160 && AvFILLp (av) == 0 /* no waiters, just count */ 4148 && AvFILLp (av) == 0 /* no waiters, just count */
4161 && SvIV (AvARRAY (av)[0]) == count) 4149 && SvIV (AvARRAY (av)[0]) == count)
4162 XSRETURN_YES; 4150 XSRETURN_YES;
… …
4183 4171
4184void 4172void
4185broadcast (SV *self) 4173broadcast (SV *self)
4186 CODE: 4174 CODE:
4187{ 4175{
4188 AV *av = (AV *)SvRV (self); 4176 AV *av = (AV *)SvRV (self);
4189 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4177 coro_signal_wake (aTHX_ av, AvFILLp (av));
4190} 4178}
4191 4179
4192void 4180void
4193send (SV *self) 4181send (SV *self)
… …
4201 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4189 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4202} 4190}
4203 4191
4204IV 4192IV
4205awaited (SV *self) 4193awaited (SV *self)
4206 CODE: 4194 CODE:
4207 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4195 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4208 OUTPUT: 4196 OUTPUT:
4209 RETVAL 4197 RETVAL
4210 4198
4211 4199
… …
4216 4204
4217void 4205void
4218_schedule (...) 4206_schedule (...)
4219 CODE: 4207 CODE:
4220{ 4208{
4221 static int incede; 4209 static int incede;
4222 4210
4223 api_cede_notself (aTHX); 4211 api_cede_notself (aTHX);
4224 4212
4225 ++incede; 4213 ++incede;
4226 while (coro_nready >= incede && api_cede (aTHX)) 4214 while (coro_nready >= incede && api_cede (aTHX))
… …
4270 { 4258 {
4271 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4259 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4272 coro_old_pp_sselect = 0; 4260 coro_old_pp_sselect = 0;
4273 } 4261 }
4274 4262
4263MODULE = Coro::State PACKAGE = Coro::Util
4264
4265void
4266_exit (int code)
4267 CODE:
4268 _exit (code);
4269
4270NV
4271time ()
4272 CODE:
4273 RETVAL = nvtime (aTHX);
4274 OUTPUT:
4275 RETVAL
4276
4277NV
4278gettimeofday ()
4279 PPCODE:
4280{
4281 UV tv [2];
4282 u2time (aTHX_ tv);
4283 EXTEND (SP, 2);
4284 PUSHs (sv_2mortal (newSVuv (tv [0])));
4285 PUSHs (sv_2mortal (newSVuv (tv [1])));
4286}
4287

Diff Legend

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