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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.422 by root, Sat Oct 6 21:25:24 2012 UTC vs.
Revision 1.427 by root, Wed Dec 5 14:35:34 2012 UTC

… …
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
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))
26#endif 45#endif
27 46
28#if defined(_WIN32) 47#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 48# undef HAS_GETTIMEOFDAY
30# undef setjmp 49# undef setjmp
… …
371time_init (pTHX) 390time_init (pTHX)
372{ 391{
373 SV **svp; 392 SV **svp;
374 393
375 require_pv ("Time/HiRes.pm"); 394 require_pv ("Time/HiRes.pm");
376 395
377 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 396 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
378 397
379 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 398 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
380 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 399 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
381 400
… …
522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
523 542
524/*****************************************************************************/ 543/*****************************************************************************/
525/* padlist management and caching */ 544/* padlist management and caching */
526 545
527ecb_inline AV * 546ecb_inline PADLIST *
528coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
529{ 548{
530 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
531 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
532 553
533 newpadlist = newAV (); 554 newPADLIST(newpadlist);
555#if !PERL_VERSION_ATLEAST(5,15,3)
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
534 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
535#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
536 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
537#else 561#else
538 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
539#endif 563#endif
540 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
541 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
542 566
543 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
544 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
545 571
546 return newpadlist; 572 return newpadlist;
547} 573}
548 574
549ecb_inline void 575ecb_inline void
550free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
551{ 577{
552 /* may be during global destruction */ 578 /* may be during global destruction */
553 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
554 { 580 {
555 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
556 582
557 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
558 { 584 {
559 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
560 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
561 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
562 588
563 while (j >= 0) 589 while (j >= 0)
564 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
565 591
566 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
567 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
568 } 594 }
569 595
570 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
571 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
572 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
573 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
574 } 606 }
575} 607}
576 608
577static int 609static int
578coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
579{ 611{
580 AV *padlist; 612 PADLIST *padlist;
581 AV *av = (AV *)mg->mg_obj; 613 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
614 size_t len = *(size_t *)mg->mg_ptr;
582 615
583 /* perl manages to free our internal AV and _then_ call us */ 616 /* perl manages to free our internal AV and _then_ call us */
584 if (IN_DESTRUCT) 617 if (IN_DESTRUCT)
585 return 0; 618 return 0;
586 619
587 /* casting is fun. */ 620 while (len--)
588 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
589 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
590
591 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
592 622
593 return 0; 623 return 0;
594} 624}
595 625
596static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
… …
601/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
602ecb_inline void 632ecb_inline void
603get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
604{ 634{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 636 size_t *lenp;
607 637
608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
610 else 640 else
611 { 641 {
612#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
613 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
614 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
624 654
625ecb_inline void 655ecb_inline void
626put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
627{ 657{
628 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
629 AV *av;
630 659
631 if (ecb_expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
632 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 662 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
663 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
664 mg->mg_len = 1; /* so mg_free frees mg_ptr */
665 }
666 else
667 Renew (mg->mg_ptr,
668 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
669 char);
633 670
634 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
635
636 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
637 av_extend (av, AvFILLp (av) + 1);
638
639 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
640} 672}
641 673
642/** load & save, init *******************************************************/ 674/** load & save, init *******************************************************/
643 675
644ecb_inline void 676ecb_inline void
… …
719 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
720 while (ecb_expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
721 { 753 {
722 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
723 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
724 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
725 } 757 }
726 758
727 PUTBACK; 759 PUTBACK;
728 } 760 }
729 761
… …
992 { 1024 {
993 SV **svp = 0; 1025 SV **svp = 0;
994 1026
995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
997 1029
998 if (svp) 1030 if (svp)
999 { 1031 {
1000 SV *ssv; 1032 SV *ssv;
1001 1033
1002 if (!*svp) 1034 if (!*svp)
… …
1108 PL_hints = 0; 1140 PL_hints = 0;
1109 1141
1110 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
1111 PL_diehook = SvREFCNT_inc (rv_diehook); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
1112 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1113 1145
1114 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
1115 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
1116 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
1117 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1118 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
1501{ 1533{
1502 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1503 void *stack_start; 1535 void *stack_start;
1504 size_t stack_size; 1536 size_t stack_size;
1505 1537
1538#if CORO_FIBER
1539
1540 cctx->ssize = cctx_stacksize * sizeof (long);
1541 cctx->sptr = 0;
1542
1543#else
1544
1506#if HAVE_MMAP 1545 #if HAVE_MMAP
1507 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1546 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1508 /* mmap supposedly does allocate-on-write for us */ 1547 /* mmap supposedly does allocate-on-write for us */
1509 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0); 1548 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1510 1549
1511 if (cctx->sptr != (void *)-1) 1550 if (cctx->sptr != (void *)-1)
1512 { 1551 {
1513 #if CORO_STACKGUARD 1552 #if CORO_STACKGUARD
1514 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1553 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1515 #endif 1554 #endif
1516 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE; 1555 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1517 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1556 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1518 cctx->flags |= CC_MAPPED; 1557 cctx->flags |= CC_MAPPED;
1519 } 1558 }
1520 else 1559 else
1521#endif 1560 #endif
1522 { 1561 {
1523 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1562 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1524 New (0, cctx->sptr, cctx_stacksize, long); 1563 New (0, cctx->sptr, cctx_stacksize, long);
1525 1564
1526 if (!cctx->sptr) 1565 if (!cctx->sptr)
1527 { 1566 {
1528 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1567 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1529 _exit (EXIT_FAILURE); 1568 _exit (EXIT_FAILURE);
1530 } 1569 }
1531 1570
1532 stack_start = cctx->sptr; 1571 stack_start = cctx->sptr;
1533 stack_size = cctx->ssize; 1572 stack_size = cctx->ssize;
1534 } 1573 }
1574 #endif
1535 1575
1536 #if CORO_USE_VALGRIND 1576 #if CORO_USE_VALGRIND
1537 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size); 1577 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1538 #endif 1578 #endif
1539 1579
… …
1729 return; 1769 return;
1730 1770
1731 slf_destroy (aTHX_ coro); 1771 slf_destroy (aTHX_ coro);
1732 1772
1733 coro->flags |= CF_ZOMBIE; 1773 coro->flags |= CF_ZOMBIE;
1734 1774
1735 if (coro->flags & CF_READY) 1775 if (coro->flags & CF_READY)
1736 { 1776 {
1737 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1777 /* reduce nready, as destroying a ready coro effectively unreadies it */
1738 /* alternative: look through all ready queues and remove the coro */ 1778 /* alternative: look through all ready queues and remove the coro */
1739 --coro_nready; 1779 --coro_nready;
… …
2172 2212
2173static void 2213static void
2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2214coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2175{ 2215{
2176 AV *av; 2216 AV *av;
2177 2217
2178 if (coro->status) 2218 if (coro->status)
2179 { 2219 {
2180 av = coro->status; 2220 av = coro->status;
2181 av_clear (av); 2221 av_clear (av);
2182 } 2222 }
… …
2229 2269
2230 coro = SvSTATE (arg [0]); 2270 coro = SvSTATE (arg [0]);
2231 coro_hv = coro->hv; 2271 coro_hv = coro->hv;
2232 2272
2233 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2273 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2234 2274
2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2275 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2236 { 2276 {
2237 /* coro currently busy cancelling something, so just notify it */ 2277 /* coro currently busy cancelling something, so just notify it */
2238 coro->slf_frame.data = (void *)coro; 2278 coro->slf_frame.data = (void *)coro;
2239 2279
… …
2418 2458
2419static int 2459static int
2420slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2460slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2421{ 2461{
2422 SV *data = (SV *)frame->data; 2462 SV *data = (SV *)frame->data;
2423 2463
2424 if (CORO_THROW) 2464 if (CORO_THROW)
2425 return 0; 2465 return 0;
2426 2466
2427 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2467 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2428 return 1; 2468 return 1;
… …
2464 cb = sv_2mortal (coro->rouse_cb); 2504 cb = sv_2mortal (coro->rouse_cb);
2465 coro->rouse_cb = 0; 2505 coro->rouse_cb = 0;
2466 } 2506 }
2467 2507
2468 if (!SvROK (cb) 2508 if (!SvROK (cb)
2469 || SvTYPE (SvRV (cb)) != SVt_PVCV 2509 || SvTYPE (SvRV (cb)) != SVt_PVCV
2470 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2510 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2471 croak ("Coro::rouse_wait called with illegal callback argument,"); 2511 croak ("Coro::rouse_wait called with illegal callback argument,");
2472 2512
2473 { 2513 {
2474 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2514 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3589void 3629void
3590list () 3630list ()
3591 PROTOTYPE: 3631 PROTOTYPE:
3592 PPCODE: 3632 PPCODE:
3593{ 3633{
3594 struct coro *coro; 3634 struct coro *coro;
3595 for (coro = coro_first; coro; coro = coro->next) 3635 for (coro = coro_first; coro; coro = coro->next)
3596 if (coro->hv) 3636 if (coro->hv)
3597 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3637 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3598} 3638}
3599 3639
… …
3761 3801
3762void 3802void
3763times (Coro::State self) 3803times (Coro::State self)
3764 PPCODE: 3804 PPCODE:
3765{ 3805{
3766 struct coro *current = SvSTATE (coro_current); 3806 struct coro *current = SvSTATE (coro_current);
3767 3807
3768 if (ecb_expect_false (current == self)) 3808 if (ecb_expect_false (current == self))
3769 { 3809 {
3770 coro_times_update (); 3810 coro_times_update ();
3771 coro_times_add (SvSTATE (coro_current)); 3811 coro_times_add (SvSTATE (coro_current));
… …
3814 3854
3815 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3855 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3816 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3856 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3817 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3857 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3818 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3858 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3819 3859
3820 coro_stash = gv_stashpv ("Coro", TRUE); 3860 coro_stash = gv_stashpv ("Coro", TRUE);
3821 3861
3822 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3862 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3823 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3863 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3824 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3864 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4046 on_leave = 1 4086 on_leave = 1
4047 PROTOTYPE: & 4087 PROTOTYPE: &
4048 CODE: 4088 CODE:
4049{ 4089{
4050 struct coro *coro = SvSTATE_current; 4090 struct coro *coro = SvSTATE_current;
4051 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4091 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4052 4092
4053 block = s_get_cv_croak (block); 4093 block = s_get_cv_croak (block);
4054 4094
4055 if (!*avp) 4095 if (!*avp)
4056 *avp = newAV (); 4096 *avp = newAV ();
… …
4076 4116
4077SV * 4117SV *
4078new (SV *klass, SV *count = 0) 4118new (SV *klass, SV *count = 0)
4079 CODE: 4119 CODE:
4080{ 4120{
4081 int semcnt = 1; 4121 int semcnt = 1;
4082 4122
4083 if (count) 4123 if (count)
4084 { 4124 {
4085 SvGETMAGIC (count); 4125 SvGETMAGIC (count);
4086 4126
… …
4146 XSRETURN_NO; 4186 XSRETURN_NO;
4147} 4187}
4148 4188
4149void 4189void
4150waiters (SV *self) 4190waiters (SV *self)
4151 PPCODE: 4191 PPCODE:
4152{ 4192{
4153 AV *av = (AV *)SvRV (self); 4193 AV *av = (AV *)SvRV (self);
4154 int wcount = AvFILLp (av) + 1 - 1; 4194 int wcount = AvFILLp (av) + 1 - 1;
4155 4195
4156 if (GIMME_V == G_SCALAR) 4196 if (GIMME_V == G_SCALAR)
… …
4168 4208
4169void 4209void
4170_may_delete (SV *sem, int count, unsigned int extra_refs) 4210_may_delete (SV *sem, int count, unsigned int extra_refs)
4171 PPCODE: 4211 PPCODE:
4172{ 4212{
4173 AV *av = (AV *)SvRV (sem); 4213 AV *av = (AV *)SvRV (sem);
4174 4214
4175 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4215 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4176 && AvFILLp (av) == 0 /* no waiters, just count */ 4216 && AvFILLp (av) == 0 /* no waiters, just count */
4177 && SvIV (AvARRAY (av)[0]) == count) 4217 && SvIV (AvARRAY (av)[0]) == count)
4178 XSRETURN_YES; 4218 XSRETURN_YES;
… …
4199 4239
4200void 4240void
4201broadcast (SV *self) 4241broadcast (SV *self)
4202 CODE: 4242 CODE:
4203{ 4243{
4204 AV *av = (AV *)SvRV (self); 4244 AV *av = (AV *)SvRV (self);
4205 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4245 coro_signal_wake (aTHX_ av, AvFILLp (av));
4206} 4246}
4207 4247
4208void 4248void
4209send (SV *self) 4249send (SV *self)
… …
4217 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4257 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4218} 4258}
4219 4259
4220IV 4260IV
4221awaited (SV *self) 4261awaited (SV *self)
4222 CODE: 4262 CODE:
4223 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4263 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4224 OUTPUT: 4264 OUTPUT:
4225 RETVAL 4265 RETVAL
4226 4266
4227 4267
… …
4232 4272
4233void 4273void
4234_schedule (...) 4274_schedule (...)
4235 CODE: 4275 CODE:
4236{ 4276{
4237 static int incede; 4277 static int incede;
4238 4278
4239 api_cede_notself (aTHX); 4279 api_cede_notself (aTHX);
4240 4280
4241 ++incede; 4281 ++incede;
4242 while (coro_nready >= incede && api_cede (aTHX)) 4282 while (coro_nready >= incede && api_cede (aTHX))

Diff Legend

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