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.424 by root, Fri Nov 30 19:27:28 2012 UTC vs.
Revision 1.436 by root, Tue Nov 5 14:38:46 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
… …
23#include <errno.h> 23#include <errno.h>
24#include <assert.h> 24#include <assert.h>
25 25
26#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
27# 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))
28#endif 45#endif
29 46
30#if defined(_WIN32) 47#if defined(_WIN32)
31# undef HAS_GETTIMEOFDAY 48# undef HAS_GETTIMEOFDAY
32# undef setjmp 49# undef setjmp
… …
35# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
36#else 53#else
37# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
38#endif 55#endif
39 56
40#if HAVE_MMAP
41# include <unistd.h>
42# include <sys/mman.h>
43# ifndef MAP_ANONYMOUS
44# ifdef MAP_ANON
45# define MAP_ANONYMOUS MAP_ANON
46# else
47# undef HAVE_MMAP
48# endif
49# endif
50# include <limits.h>
51# ifndef PAGESIZE
52# define PAGESIZE pagesize
53# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
54static long pagesize;
55# else
56# define BOOT_PAGESIZE (void)0
57# endif
58#else
59# define PAGESIZE 0
60# define BOOT_PAGESIZE (void)0
61#endif
62
63#if CORO_USE_VALGRIND
64# include <valgrind/valgrind.h>
65#endif
66
67/* the maximum number of idle cctx that will be pooled */ 57/* the maximum number of idle cctx that will be pooled */
68static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
69 59
70#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
71# define HAS_SCOPESTACK_NAME 1 61# define HAS_SCOPESTACK_NAME 1
72#endif
73
74#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
75# undef CORO_STACKGUARD
76#endif
77
78#ifndef CORO_STACKGUARD
79# define CORO_STACKGUARD 0
80#endif 62#endif
81 63
82/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
83#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
84# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
175typedef struct coro_cctx 157typedef struct coro_cctx
176{ 158{
177 struct coro_cctx *next; 159 struct coro_cctx *next;
178 160
179 /* the stack */ 161 /* the stack */
180 void *sptr; 162 struct coro_stack stack;
181 size_t ssize;
182 163
183 /* cpu state */ 164 /* cpu state */
184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG 166#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
295#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
296 277
297/** JIT *********************************************************************/ 278/** JIT *********************************************************************/
298 279
299#if CORO_JIT 280#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */ 281 /* APPLE doesn't have mmap though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE 283 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY 284 #if ECB_AMD64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix" 285 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY 286 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix" 287 #define CORO_JIT_TYPE "x86-unix"
307 #endif 288 #endif
308 #endif 289 #endif
309#endif 290#endif
310 291
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
312 #undef CORO_JIT 293 #undef CORO_JIT
313#endif 294#endif
314 295
315#if CORO_JIT 296#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *); 297 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
525 506
526/*****************************************************************************/ 507/*****************************************************************************/
527/* padlist management and caching */ 508/* padlist management and caching */
528 509
529ecb_inline AV * 510ecb_inline PADLIST *
530coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
531{ 512{
532 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
533 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1;
534 517
535 newpadlist = newAV (); 518#if NEWPADAPI
519
520 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522 while (!PadlistARRAY (padlist)[off - 1])
523 --off;
524
525 Perl_pad_push (aTHX_ padlist, off);
526
527 newpad = PadlistARRAY (padlist)[off];
528 PadlistARRAY (padlist)[off] = 0;
529
530#else
531
532#if PERL_VERSION_ATLEAST (5,10,0)
533 Perl_pad_push (aTHX_ padlist, off);
534#else
535 Perl_pad_push (aTHX_ padlist, off, 1);
536#endif
537
538 newpad = PadlistARRAY (padlist)[off];
539 PadlistMAX (padlist) = off - 1;
540
541#endif
542
543 newPADLIST (newpadlist);
544#if !PERL_VERSION_ATLEAST(5,15,3)
545 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
536 AvREAL_off (newpadlist); 546 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 547#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
543 --AvFILLp (padlist);
544 548
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 549 /* Already extended to 2 elements by newPADLIST. */
546 av_store (newpadlist, 1, (SV *)newpad); 550 PadlistMAX (newpadlist) = 1;
551 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
552 PadlistARRAY (newpadlist)[1] = newpad;
547 553
548 return newpadlist; 554 return newpadlist;
549} 555}
550 556
551ecb_inline void 557ecb_inline void
552free_padlist (pTHX_ AV *padlist) 558free_padlist (pTHX_ PADLIST *padlist)
553{ 559{
554 /* may be during global destruction */ 560 /* may be during global destruction */
555 if (!IN_DESTRUCT) 561 if (!IN_DESTRUCT)
556 { 562 {
557 I32 i = AvFILLp (padlist); 563 I32 i = PadlistMAX (padlist);
558 564
559 while (i > 0) /* special-case index 0 */ 565 while (i > 0) /* special-case index 0 */
560 { 566 {
561 /* we try to be extra-careful here */ 567 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 568 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av); 569 I32 j = PadMAX (pad);
564 570
565 while (j >= 0) 571 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 572 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 573
568 AvFILLp (av) = -1; 574 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 575 SvREFCNT_dec (pad);
570 } 576 }
571 577
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 578 SvREFCNT_dec (PadlistNAMES (padlist));
573 579
580#if NEWPADAPI
581 Safefree (PadlistARRAY (padlist));
582 Safefree (padlist);
583#else
574 AvFILLp (padlist) = -1; 584 AvFILLp (padlist) = -1;
585 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 586 SvREFCNT_dec ((SV*)padlist);
587#endif
576 } 588 }
577} 589}
578 590
579static int 591static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 592coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 593{
582 AV *padlist; 594 PADLIST *padlist;
583 AV *av = (AV *)mg->mg_obj; 595 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
596 size_t len = *(size_t *)mg->mg_ptr;
584 597
585 /* perl manages to free our internal AV and _then_ call us */ 598 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 599 if (IN_DESTRUCT)
587 return 0; 600 return 0;
588 601
589 /* casting is fun. */ 602 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 603 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 604
595 return 0; 605 return 0;
596} 606}
597 607
598static MGVTBL coro_cv_vtbl = { 608static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 613/* the next two functions merely cache the padlists */
604ecb_inline void 614ecb_inline void
605get_padlist (pTHX_ CV *cv) 615get_padlist (pTHX_ CV *cv)
606{ 616{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 617 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 618 size_t *lenp;
609 619
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 620 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 621 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 622 else
613 { 623 {
614#if CORO_PREFER_PERL_FUNCTIONS 624#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 625 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 626 /* in practise, it seems to be less stable */
… …
626 636
627ecb_inline void 637ecb_inline void
628put_padlist (pTHX_ CV *cv) 638put_padlist (pTHX_ CV *cv)
629{ 639{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 640 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 641
633 if (ecb_expect_false (!mg)) 642 if (ecb_expect_false (!mg))
643 {
634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 644 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
645 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
646 mg->mg_len = 1; /* so mg_free frees mg_ptr */
647 }
648 else
649 Renew (mg->mg_ptr,
650 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
651 char);
635 652
636 av = (AV *)mg->mg_obj; 653 ((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} 654}
643 655
644/** load & save, init *******************************************************/ 656/** load & save, init *******************************************************/
645 657
646ecb_inline void 658ecb_inline void
… …
721 /* now do the ugly restore mess */ 733 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 734 while (ecb_expect_true (cv = (CV *)POPs))
723 { 735 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 736 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 737 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 738 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 739 }
728 740
729 PUTBACK; 741 PUTBACK;
730 } 742 }
731 743
… …
1489static coro_cctx * 1501static coro_cctx *
1490cctx_new_empty (void) 1502cctx_new_empty (void)
1491{ 1503{
1492 coro_cctx *cctx = cctx_new (); 1504 coro_cctx *cctx = cctx_new ();
1493 1505
1494 cctx->sptr = 0; 1506 cctx->stack.sptr = 0;
1495 coro_create (&cctx->cctx, 0, 0, 0, 0); 1507 coro_create (&cctx->cctx, 0, 0, 0, 0);
1496 1508
1497 return cctx; 1509 return cctx;
1498} 1510}
1499 1511
1500/* create a new cctx suitable as destination/running a perl interpreter */ 1512/* create a new cctx suitable as destination/running a perl interpreter */
1501static coro_cctx * 1513static coro_cctx *
1502cctx_new_run (void) 1514cctx_new_run (void)
1503{ 1515{
1504 coro_cctx *cctx = cctx_new (); 1516 coro_cctx *cctx = cctx_new ();
1505 void *stack_start;
1506 size_t stack_size;
1507 1517
1508#if HAVE_MMAP 1518 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1509 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1510 /* mmap supposedly does allocate-on-write for us */
1511 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1512
1513 if (cctx->sptr != (void *)-1)
1514 {
1515 #if CORO_STACKGUARD
1516 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1517 #endif
1518 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1519 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1520 cctx->flags |= CC_MAPPED;
1521 } 1519 {
1522 else
1523#endif
1524 {
1525 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1526 New (0, cctx->sptr, cctx_stacksize, long);
1527
1528 if (!cctx->sptr)
1529 {
1530 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1520 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1531 _exit (EXIT_FAILURE); 1521 _exit (EXIT_FAILURE);
1532 }
1533
1534 stack_start = cctx->sptr;
1535 stack_size = cctx->ssize;
1536 } 1522 }
1537 1523
1538 #if CORO_USE_VALGRIND
1539 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1540 #endif
1541
1542 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1524 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1543 1525
1544 return cctx; 1526 return cctx;
1545} 1527}
1546 1528
1547static void 1529static void
… …
1553 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1535 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1554 1536
1555 --cctx_count; 1537 --cctx_count;
1556 coro_destroy (&cctx->cctx); 1538 coro_destroy (&cctx->cctx);
1557 1539
1558 /* coro_transfer creates new, empty cctx's */ 1540 coro_stack_free (&cctx->stack);
1559 if (cctx->sptr)
1560 {
1561 #if CORO_USE_VALGRIND
1562 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1563 #endif
1564
1565#if HAVE_MMAP
1566 if (cctx->flags & CC_MAPPED)
1567 munmap (cctx->sptr, cctx->ssize);
1568 else
1569#endif
1570 Safefree (cctx->sptr);
1571 }
1572 1541
1573 Safefree (cctx); 1542 Safefree (cctx);
1574} 1543}
1575 1544
1576/* wether this cctx should be destructed */ 1545/* wether this cctx should be destructed */
… …
1595} 1564}
1596 1565
1597static void 1566static void
1598cctx_put (coro_cctx *cctx) 1567cctx_put (coro_cctx *cctx)
1599{ 1568{
1600 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1569 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1601 1570
1602 /* free another cctx if overlimit */ 1571 /* free another cctx if overlimit */
1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1572 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1604 { 1573 {
1605 coro_cctx *first = cctx_first; 1574 coro_cctx *first = cctx_first;
… …
2144{ 2113{
2145 AV *od = coro->on_destroy; 2114 AV *od = coro->on_destroy;
2146 2115
2147 if (!od) 2116 if (!od)
2148 return; 2117 return;
2118
2119 coro->on_destroy = 0;
2120 sv_2mortal ((SV *)od);
2149 2121
2150 while (AvFILLp (od) >= 0) 2122 while (AvFILLp (od) >= 0)
2151 { 2123 {
2152 SV *cb = sv_2mortal (av_pop (od)); 2124 SV *cb = sv_2mortal (av_pop (od));
2153 2125
… …
3197 /* it quickly returns */ 3169 /* it quickly returns */
3198 if (CORO_THROW) 3170 if (CORO_THROW)
3199 return 0; 3171 return 0;
3200 3172
3201 /* one element that is an RV? repeat! */ 3173 /* one element that is an RV? repeat! */
3202 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3174 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3203 return 1; 3175 return 1;
3204 3176
3205 /* restore status */ 3177 /* restore status */
3206 { 3178 {
3207 SV *data_sv = av_pop (state); 3179 SV *data_sv = av_pop (state);
… …
3440#ifdef USE_ITHREADS 3412#ifdef USE_ITHREADS
3441# if CORO_PTHREAD 3413# if CORO_PTHREAD
3442 coro_thx = PERL_GET_CONTEXT; 3414 coro_thx = PERL_GET_CONTEXT;
3443# endif 3415# endif
3444#endif 3416#endif
3445 BOOT_PAGESIZE;
3446
3447 /* perl defines these to check for existance first, but why it doesn't */ 3417 /* perl defines these to check for existance first, but why it doesn't */
3448 /* just create them one at init time is not clear to me, except for */ 3418 /* just create them one at init time is not clear to me, except for */
3449 /* programs trying to delete them, but... */ 3419 /* programs trying to delete them, but... */
3450 /* anyway, we declare this as invalid and make sure they are initialised here */ 3420 /* anyway, we declare this as invalid and make sure they are initialised here */
3451 DEFSV; 3421 DEFSV;
… …
3521void 3491void
3522transfer (...) 3492transfer (...)
3523 PROTOTYPE: $$ 3493 PROTOTYPE: $$
3524 CODE: 3494 CODE:
3525 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3495 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3526
3527void
3528_exit (int code)
3529 PROTOTYPE: $
3530 CODE:
3531 _exit (code);
3532 3496
3533SV * 3497SV *
3534clone (Coro::State coro) 3498clone (Coro::State coro)
3535 CODE: 3499 CODE:
3536{ 3500{
… …
3591void 3555void
3592list () 3556list ()
3593 PROTOTYPE: 3557 PROTOTYPE:
3594 PPCODE: 3558 PPCODE:
3595{ 3559{
3596 struct coro *coro; 3560 struct coro *coro;
3597 for (coro = coro_first; coro; coro = coro->next) 3561 for (coro = coro_first; coro; coro = coro->next)
3598 if (coro->hv) 3562 if (coro->hv)
3599 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3563 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3600} 3564}
3601 3565
… …
3763 3727
3764void 3728void
3765times (Coro::State self) 3729times (Coro::State self)
3766 PPCODE: 3730 PPCODE:
3767{ 3731{
3768 struct coro *current = SvSTATE (coro_current); 3732 struct coro *current = SvSTATE (coro_current);
3769 3733
3770 if (ecb_expect_false (current == self)) 3734 if (ecb_expect_false (current == self))
3771 { 3735 {
3772 coro_times_update (); 3736 coro_times_update ();
3773 coro_times_add (SvSTATE (coro_current)); 3737 coro_times_add (SvSTATE (coro_current));
… …
4048 on_leave = 1 4012 on_leave = 1
4049 PROTOTYPE: & 4013 PROTOTYPE: &
4050 CODE: 4014 CODE:
4051{ 4015{
4052 struct coro *coro = SvSTATE_current; 4016 struct coro *coro = SvSTATE_current;
4053 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4017 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4054 4018
4055 block = s_get_cv_croak (block); 4019 block = s_get_cv_croak (block);
4056 4020
4057 if (!*avp) 4021 if (!*avp)
4058 *avp = newAV (); 4022 *avp = newAV ();
… …
4078 4042
4079SV * 4043SV *
4080new (SV *klass, SV *count = 0) 4044new (SV *klass, SV *count = 0)
4081 CODE: 4045 CODE:
4082{ 4046{
4083 int semcnt = 1; 4047 int semcnt = 1;
4084 4048
4085 if (count) 4049 if (count)
4086 { 4050 {
4087 SvGETMAGIC (count); 4051 SvGETMAGIC (count);
4088 4052
… …
4148 XSRETURN_NO; 4112 XSRETURN_NO;
4149} 4113}
4150 4114
4151void 4115void
4152waiters (SV *self) 4116waiters (SV *self)
4153 PPCODE: 4117 PPCODE:
4154{ 4118{
4155 AV *av = (AV *)SvRV (self); 4119 AV *av = (AV *)SvRV (self);
4156 int wcount = AvFILLp (av) + 1 - 1; 4120 int wcount = AvFILLp (av) + 1 - 1;
4157 4121
4158 if (GIMME_V == G_SCALAR) 4122 if (GIMME_V == G_SCALAR)
… …
4170 4134
4171void 4135void
4172_may_delete (SV *sem, int count, unsigned int extra_refs) 4136_may_delete (SV *sem, int count, unsigned int extra_refs)
4173 PPCODE: 4137 PPCODE:
4174{ 4138{
4175 AV *av = (AV *)SvRV (sem); 4139 AV *av = (AV *)SvRV (sem);
4176 4140
4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4141 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4178 && AvFILLp (av) == 0 /* no waiters, just count */ 4142 && AvFILLp (av) == 0 /* no waiters, just count */
4179 && SvIV (AvARRAY (av)[0]) == count) 4143 && SvIV (AvARRAY (av)[0]) == count)
4180 XSRETURN_YES; 4144 XSRETURN_YES;
… …
4201 4165
4202void 4166void
4203broadcast (SV *self) 4167broadcast (SV *self)
4204 CODE: 4168 CODE:
4205{ 4169{
4206 AV *av = (AV *)SvRV (self); 4170 AV *av = (AV *)SvRV (self);
4207 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4171 coro_signal_wake (aTHX_ av, AvFILLp (av));
4208} 4172}
4209 4173
4210void 4174void
4211send (SV *self) 4175send (SV *self)
… …
4219 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4183 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4220} 4184}
4221 4185
4222IV 4186IV
4223awaited (SV *self) 4187awaited (SV *self)
4224 CODE: 4188 CODE:
4225 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4189 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4226 OUTPUT: 4190 OUTPUT:
4227 RETVAL 4191 RETVAL
4228 4192
4229 4193
… …
4234 4198
4235void 4199void
4236_schedule (...) 4200_schedule (...)
4237 CODE: 4201 CODE:
4238{ 4202{
4239 static int incede; 4203 static int incede;
4240 4204
4241 api_cede_notself (aTHX); 4205 api_cede_notself (aTHX);
4242 4206
4243 ++incede; 4207 ++incede;
4244 while (coro_nready >= incede && api_cede (aTHX)) 4208 while (coro_nready >= incede && api_cede (aTHX))
… …
4288 { 4252 {
4289 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4253 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4290 coro_old_pp_sselect = 0; 4254 coro_old_pp_sselect = 0;
4291 } 4255 }
4292 4256
4257MODULE = Coro::State PACKAGE = Coro::Util
4258
4259void
4260_exit (int code)
4261 CODE:
4262 _exit (code);
4263
4264NV
4265time ()
4266 CODE:
4267 RETVAL = nvtime (aTHX);
4268 OUTPUT:
4269 RETVAL
4270
4271NV
4272gettimeofday ()
4273 PPCODE:
4274{
4275 UV tv [2];
4276 u2time (aTHX_ tv);
4277 EXTEND (SP, 2);
4278 PUSHs (sv_2mortal (newSVuv (tv [0])));
4279 PUSHs (sv_2mortal (newSVuv (tv [1])));
4280}
4281

Diff Legend

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