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.423 by root, Mon Oct 8 23:13:36 2012 UTC vs.
Revision 1.429 by root, Fri Dec 7 14:21:09 2012 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
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 __x86_64 && 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 *);
… …
373time_init (pTHX) 354time_init (pTHX)
374{ 355{
375 SV **svp; 356 SV **svp;
376 357
377 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
378 359
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380 361
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383 364
… …
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 const off = PadlistMAX (padlist) + 1;
534 517
535 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
536 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
537#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
538 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
539#else 525#else
540 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
541#endif 527#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
543 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
544 530
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
546 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
547 535
548 return newpadlist; 536 return newpadlist;
549} 537}
550 538
551ecb_inline void 539ecb_inline void
552free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
553{ 541{
554 /* may be during global destruction */ 542 /* may be during global destruction */
555 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
556 { 544 {
557 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
558 546
559 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
560 { 548 {
561 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
564 552
565 while (j >= 0) 553 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 555
568 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
570 } 558 }
571 559
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
573 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
574 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
576 } 570 }
577} 571}
578 572
579static int 573static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 575{
582 AV *padlist; 576 PADLIST *padlist;
583 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
584 579
585 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
587 return 0; 582 return 0;
588 583
589 /* casting is fun. */ 584 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 586
595 return 0; 587 return 0;
596} 588}
597 589
598static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
604ecb_inline void 596ecb_inline void
605get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
606{ 598{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 600 size_t *lenp;
609 601
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 604 else
613 { 605 {
614#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
626 618
627ecb_inline void 619ecb_inline void
628put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
629{ 621{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 623
633 if (ecb_expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
635 634
636 av = (AV *)mg->mg_obj; 635 ((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} 636}
643 637
644/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
645 639
646ecb_inline void 640ecb_inline void
… …
721 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
723 { 717 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 721 }
728 722
729 PUTBACK; 723 PUTBACK;
730 } 724 }
731 725
… …
994 { 988 {
995 SV **svp = 0; 989 SV **svp = 0;
996 990
997 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
998 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
999 993
1000 if (svp) 994 if (svp)
1001 { 995 {
1002 SV *ssv; 996 SV *ssv;
1003 997
1004 if (!*svp) 998 if (!*svp)
… …
1110 PL_hints = 0; 1104 PL_hints = 0;
1111 1105
1112 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1113 PL_diehook = SvREFCNT_inc (rv_diehook); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1114 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1115 1109
1116 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1117 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1118 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1119 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1120 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1489static coro_cctx * 1483static coro_cctx *
1490cctx_new_empty (void) 1484cctx_new_empty (void)
1491{ 1485{
1492 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1493 1487
1494 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1495 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1496 1490
1497 return cctx; 1491 return cctx;
1498} 1492}
1499 1493
1500/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1501static coro_cctx * 1495static coro_cctx *
1502cctx_new_run (void) 1496cctx_new_run (void)
1503{ 1497{
1504 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1505 void *stack_start;
1506 size_t stack_size;
1507 1499
1508#if HAVE_MMAP 1500 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 } 1501 {
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."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1531 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1532 }
1533
1534 stack_start = cctx->sptr;
1535 stack_size = cctx->ssize;
1536 } 1504 }
1537 1505
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); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1543 1507
1544 return cctx; 1508 return cctx;
1545} 1509}
1546 1510
1547static void 1511static void
… …
1553 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1554 1518
1555 --cctx_count; 1519 --cctx_count;
1556 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1557 1521
1558 /* coro_transfer creates new, empty cctx's */ 1522 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 1523
1573 Safefree (cctx); 1524 Safefree (cctx);
1574} 1525}
1575 1526
1576/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
… …
1595} 1546}
1596 1547
1597static void 1548static void
1598cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1599{ 1550{
1600 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1601 1552
1602 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1604 { 1555 {
1605 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
… …
1731 return; 1682 return;
1732 1683
1733 slf_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1734 1685
1735 coro->flags |= CF_ZOMBIE; 1686 coro->flags |= CF_ZOMBIE;
1736 1687
1737 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1738 { 1689 {
1739 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1740 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1741 --coro_nready; 1692 --coro_nready;
… …
2174 2125
2175static void 2126static void
2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2177{ 2128{
2178 AV *av; 2129 AV *av;
2179 2130
2180 if (coro->status) 2131 if (coro->status)
2181 { 2132 {
2182 av = coro->status; 2133 av = coro->status;
2183 av_clear (av); 2134 av_clear (av);
2184 } 2135 }
… …
2231 2182
2232 coro = SvSTATE (arg [0]); 2183 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv; 2184 coro_hv = coro->hv;
2234 2185
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236 2187
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 { 2189 {
2239 /* coro currently busy cancelling something, so just notify it */ 2190 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro; 2191 coro->slf_frame.data = (void *)coro;
2241 2192
… …
2420 2371
2421static int 2372static int
2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2423{ 2374{
2424 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2425 2376
2426 if (CORO_THROW) 2377 if (CORO_THROW)
2427 return 0; 2378 return 0;
2428 2379
2429 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2430 return 1; 2381 return 1;
… …
2466 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2467 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2468 } 2419 }
2469 2420
2470 if (!SvROK (cb) 2421 if (!SvROK (cb)
2471 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2473 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2474 2425
2475 { 2426 {
2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3440#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
3441# if CORO_PTHREAD 3392# if CORO_PTHREAD
3442 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
3443# endif 3394# endif
3444#endif 3395#endif
3445 BOOT_PAGESIZE;
3446
3447 /* perl defines these to check for existance first, but why it doesn't */ 3396 /* 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 */ 3397 /* just create them one at init time is not clear to me, except for */
3449 /* programs trying to delete them, but... */ 3398 /* programs trying to delete them, but... */
3450 /* anyway, we declare this as invalid and make sure they are initialised here */ 3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3451 DEFSV; 3400 DEFSV;
… …
3591void 3540void
3592list () 3541list ()
3593 PROTOTYPE: 3542 PROTOTYPE:
3594 PPCODE: 3543 PPCODE:
3595{ 3544{
3596 struct coro *coro; 3545 struct coro *coro;
3597 for (coro = coro_first; coro; coro = coro->next) 3546 for (coro = coro_first; coro; coro = coro->next)
3598 if (coro->hv) 3547 if (coro->hv)
3599 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3548 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3600} 3549}
3601 3550
… …
3763 3712
3764void 3713void
3765times (Coro::State self) 3714times (Coro::State self)
3766 PPCODE: 3715 PPCODE:
3767{ 3716{
3768 struct coro *current = SvSTATE (coro_current); 3717 struct coro *current = SvSTATE (coro_current);
3769 3718
3770 if (ecb_expect_false (current == self)) 3719 if (ecb_expect_false (current == self))
3771 { 3720 {
3772 coro_times_update (); 3721 coro_times_update ();
3773 coro_times_add (SvSTATE (coro_current)); 3722 coro_times_add (SvSTATE (coro_current));
… …
3816 3765
3817 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3766 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3818 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3767 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3819 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3768 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3820 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3769 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3821 3770
3822 coro_stash = gv_stashpv ("Coro", TRUE); 3771 coro_stash = gv_stashpv ("Coro", TRUE);
3823 3772
3824 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3773 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3825 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3774 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3826 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3775 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4048 on_leave = 1 3997 on_leave = 1
4049 PROTOTYPE: & 3998 PROTOTYPE: &
4050 CODE: 3999 CODE:
4051{ 4000{
4052 struct coro *coro = SvSTATE_current; 4001 struct coro *coro = SvSTATE_current;
4053 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4002 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4054 4003
4055 block = s_get_cv_croak (block); 4004 block = s_get_cv_croak (block);
4056 4005
4057 if (!*avp) 4006 if (!*avp)
4058 *avp = newAV (); 4007 *avp = newAV ();
… …
4078 4027
4079SV * 4028SV *
4080new (SV *klass, SV *count = 0) 4029new (SV *klass, SV *count = 0)
4081 CODE: 4030 CODE:
4082{ 4031{
4083 int semcnt = 1; 4032 int semcnt = 1;
4084 4033
4085 if (count) 4034 if (count)
4086 { 4035 {
4087 SvGETMAGIC (count); 4036 SvGETMAGIC (count);
4088 4037
… …
4148 XSRETURN_NO; 4097 XSRETURN_NO;
4149} 4098}
4150 4099
4151void 4100void
4152waiters (SV *self) 4101waiters (SV *self)
4153 PPCODE: 4102 PPCODE:
4154{ 4103{
4155 AV *av = (AV *)SvRV (self); 4104 AV *av = (AV *)SvRV (self);
4156 int wcount = AvFILLp (av) + 1 - 1; 4105 int wcount = AvFILLp (av) + 1 - 1;
4157 4106
4158 if (GIMME_V == G_SCALAR) 4107 if (GIMME_V == G_SCALAR)
… …
4170 4119
4171void 4120void
4172_may_delete (SV *sem, int count, unsigned int extra_refs) 4121_may_delete (SV *sem, int count, unsigned int extra_refs)
4173 PPCODE: 4122 PPCODE:
4174{ 4123{
4175 AV *av = (AV *)SvRV (sem); 4124 AV *av = (AV *)SvRV (sem);
4176 4125
4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4126 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4178 && AvFILLp (av) == 0 /* no waiters, just count */ 4127 && AvFILLp (av) == 0 /* no waiters, just count */
4179 && SvIV (AvARRAY (av)[0]) == count) 4128 && SvIV (AvARRAY (av)[0]) == count)
4180 XSRETURN_YES; 4129 XSRETURN_YES;
… …
4201 4150
4202void 4151void
4203broadcast (SV *self) 4152broadcast (SV *self)
4204 CODE: 4153 CODE:
4205{ 4154{
4206 AV *av = (AV *)SvRV (self); 4155 AV *av = (AV *)SvRV (self);
4207 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4156 coro_signal_wake (aTHX_ av, AvFILLp (av));
4208} 4157}
4209 4158
4210void 4159void
4211send (SV *self) 4160send (SV *self)
… …
4219 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4168 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4220} 4169}
4221 4170
4222IV 4171IV
4223awaited (SV *self) 4172awaited (SV *self)
4224 CODE: 4173 CODE:
4225 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4174 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4226 OUTPUT: 4175 OUTPUT:
4227 RETVAL 4176 RETVAL
4228 4177
4229 4178
… …
4234 4183
4235void 4184void
4236_schedule (...) 4185_schedule (...)
4237 CODE: 4186 CODE:
4238{ 4187{
4239 static int incede; 4188 static int incede;
4240 4189
4241 api_cede_notself (aTHX); 4190 api_cede_notself (aTHX);
4242 4191
4243 ++incede; 4192 ++incede;
4244 while (coro_nready >= incede && api_cede (aTHX)) 4193 while (coro_nready >= incede && api_cede (aTHX))

Diff Legend

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