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.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
… …
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))
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
28#endif 51#endif
29 52
30#if defined(_WIN32) 53#if defined(_WIN32)
31# undef HAS_GETTIMEOFDAY 54# undef HAS_GETTIMEOFDAY
32# undef setjmp 55# undef setjmp
… …
35# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
36#else 59#else
37# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
38#endif 61#endif
39 62
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 */ 63/* the maximum number of idle cctx that will be pooled */
68static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
69 65
70#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
71# define HAS_SCOPESTACK_NAME 1 67# 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 68#endif
81 69
82/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
83#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
84# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
175typedef struct coro_cctx 163typedef struct coro_cctx
176{ 164{
177 struct coro_cctx *next; 165 struct coro_cctx *next;
178 166
179 /* the stack */ 167 /* the stack */
180 void *sptr; 168 struct coro_stack stack;
181 size_t ssize;
182 169
183 /* cpu state */ 170 /* cpu state */
184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG 172#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
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
646ecb_inline void 664ecb_inline void
… …
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
… …
994 { 1012 {
995 SV **svp = 0; 1013 SV **svp = 0;
996 1014
997 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
998 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
999 1017
1000 if (svp) 1018 if (svp)
1001 { 1019 {
1002 SV *ssv; 1020 SV *ssv;
1003 1021
1004 if (!*svp) 1022 if (!*svp)
… …
1110 PL_hints = 0; 1128 PL_hints = 0;
1111 1129
1112 /* recreate the die/warn hooks */ 1130 /* recreate the die/warn hooks */
1113 PL_diehook = SvREFCNT_inc (rv_diehook); 1131 PL_diehook = SvREFCNT_inc (rv_diehook);
1114 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1132 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1115 1133
1116 GvSV (PL_defgv) = newSV (0); 1134 GvSV (PL_defgv) = newSV (0);
1117 GvAV (PL_defgv) = coro->args; coro->args = 0; 1135 GvAV (PL_defgv) = coro->args; coro->args = 0;
1118 GvSV (PL_errgv) = newSV (0); 1136 GvSV (PL_errgv) = newSV (0);
1119 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);
1120 GvHV (PL_hintgv) = 0; 1138 GvHV (PL_hintgv) = 0;
… …
1489static coro_cctx * 1507static coro_cctx *
1490cctx_new_empty (void) 1508cctx_new_empty (void)
1491{ 1509{
1492 coro_cctx *cctx = cctx_new (); 1510 coro_cctx *cctx = cctx_new ();
1493 1511
1494 cctx->sptr = 0; 1512 cctx->stack.sptr = 0;
1495 coro_create (&cctx->cctx, 0, 0, 0, 0); 1513 coro_create (&cctx->cctx, 0, 0, 0, 0);
1496 1514
1497 return cctx; 1515 return cctx;
1498} 1516}
1499 1517
1500/* create a new cctx suitable as destination/running a perl interpreter */ 1518/* create a new cctx suitable as destination/running a perl interpreter */
1501static coro_cctx * 1519static coro_cctx *
1502cctx_new_run (void) 1520cctx_new_run (void)
1503{ 1521{
1504 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1505 void *stack_start;
1506 size_t stack_size;
1507 1523
1508#if HAVE_MMAP 1524 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 } 1525 {
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."); 1526 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1531 _exit (EXIT_FAILURE); 1527 _exit (EXIT_FAILURE);
1532 }
1533
1534 stack_start = cctx->sptr;
1535 stack_size = cctx->ssize;
1536 } 1528 }
1537 1529
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); 1530 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1543 1531
1544 return cctx; 1532 return cctx;
1545} 1533}
1546 1534
1547static void 1535static void
… …
1553 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1541 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1554 1542
1555 --cctx_count; 1543 --cctx_count;
1556 coro_destroy (&cctx->cctx); 1544 coro_destroy (&cctx->cctx);
1557 1545
1558 /* coro_transfer creates new, empty cctx's */ 1546 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 1547
1573 Safefree (cctx); 1548 Safefree (cctx);
1574} 1549}
1575 1550
1576/* wether this cctx should be destructed */ 1551/* wether this cctx should be destructed */
… …
1595} 1570}
1596 1571
1597static void 1572static void
1598cctx_put (coro_cctx *cctx) 1573cctx_put (coro_cctx *cctx)
1599{ 1574{
1600 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));
1601 1576
1602 /* free another cctx if overlimit */ 1577 /* free another cctx if overlimit */
1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1578 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1604 { 1579 {
1605 coro_cctx *first = cctx_first; 1580 coro_cctx *first = cctx_first;
… …
1731 return; 1706 return;
1732 1707
1733 slf_destroy (aTHX_ coro); 1708 slf_destroy (aTHX_ coro);
1734 1709
1735 coro->flags |= CF_ZOMBIE; 1710 coro->flags |= CF_ZOMBIE;
1736 1711
1737 if (coro->flags & CF_READY) 1712 if (coro->flags & CF_READY)
1738 { 1713 {
1739 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1714 /* reduce nready, as destroying a ready coro effectively unreadies it */
1740 /* alternative: look through all ready queues and remove the coro */ 1715 /* alternative: look through all ready queues and remove the coro */
1741 --coro_nready; 1716 --coro_nready;
… …
2145 AV *od = coro->on_destroy; 2120 AV *od = coro->on_destroy;
2146 2121
2147 if (!od) 2122 if (!od)
2148 return; 2123 return;
2149 2124
2125 coro->on_destroy = 0;
2126 sv_2mortal ((SV *)od);
2127
2150 while (AvFILLp (od) >= 0) 2128 while (AvFILLp (od) >= 0)
2151 { 2129 {
2152 SV *cb = sv_2mortal (av_pop (od)); 2130 SV *cb = sv_2mortal (av_pop (od));
2153 2131
2154 /* 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 */
… …
2174 2152
2175static void 2153static void
2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2154coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2177{ 2155{
2178 AV *av; 2156 AV *av;
2179 2157
2180 if (coro->status) 2158 if (coro->status)
2181 { 2159 {
2182 av = coro->status; 2160 av = coro->status;
2183 av_clear (av); 2161 av_clear (av);
2184 } 2162 }
… …
2231 2209
2232 coro = SvSTATE (arg [0]); 2210 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv; 2211 coro_hv = coro->hv;
2234 2212
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2213 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236 2214
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2215 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 { 2216 {
2239 /* coro currently busy cancelling something, so just notify it */ 2217 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro; 2218 coro->slf_frame.data = (void *)coro;
2241 2219
… …
2420 2398
2421static int 2399static int
2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2400slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2423{ 2401{
2424 SV *data = (SV *)frame->data; 2402 SV *data = (SV *)frame->data;
2425 2403
2426 if (CORO_THROW) 2404 if (CORO_THROW)
2427 return 0; 2405 return 0;
2428 2406
2429 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2407 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2430 return 1; 2408 return 1;
… …
2466 cb = sv_2mortal (coro->rouse_cb); 2444 cb = sv_2mortal (coro->rouse_cb);
2467 coro->rouse_cb = 0; 2445 coro->rouse_cb = 0;
2468 } 2446 }
2469 2447
2470 if (!SvROK (cb) 2448 if (!SvROK (cb)
2471 || SvTYPE (SvRV (cb)) != SVt_PVCV 2449 || SvTYPE (SvRV (cb)) != SVt_PVCV
2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2450 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2473 croak ("Coro::rouse_wait called with illegal callback argument,"); 2451 croak ("Coro::rouse_wait called with illegal callback argument,");
2474 2452
2475 { 2453 {
2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3197 /* it quickly returns */ 3175 /* it quickly returns */
3198 if (CORO_THROW) 3176 if (CORO_THROW)
3199 return 0; 3177 return 0;
3200 3178
3201 /* one element that is an RV? repeat! */ 3179 /* one element that is an RV? repeat! */
3202 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3180 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3203 return 1; 3181 return 1;
3204 3182
3205 /* restore status */ 3183 /* restore status */
3206 { 3184 {
3207 SV *data_sv = av_pop (state); 3185 SV *data_sv = av_pop (state);
… …
3440#ifdef USE_ITHREADS 3418#ifdef USE_ITHREADS
3441# if CORO_PTHREAD 3419# if CORO_PTHREAD
3442 coro_thx = PERL_GET_CONTEXT; 3420 coro_thx = PERL_GET_CONTEXT;
3443# endif 3421# endif
3444#endif 3422#endif
3445 BOOT_PAGESIZE;
3446
3447 /* 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 */
3448 /* 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 */
3449 /* programs trying to delete them, but... */ 3425 /* programs trying to delete them, but... */
3450 /* 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 */
3451 DEFSV; 3427 DEFSV;
… …
3521void 3497void
3522transfer (...) 3498transfer (...)
3523 PROTOTYPE: $$ 3499 PROTOTYPE: $$
3524 CODE: 3500 CODE:
3525 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3501 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3526
3527void
3528_exit (int code)
3529 PROTOTYPE: $
3530 CODE:
3531 _exit (code);
3532 3502
3533SV * 3503SV *
3534clone (Coro::State coro) 3504clone (Coro::State coro)
3535 CODE: 3505 CODE:
3536{ 3506{
… …
3591void 3561void
3592list () 3562list ()
3593 PROTOTYPE: 3563 PROTOTYPE:
3594 PPCODE: 3564 PPCODE:
3595{ 3565{
3596 struct coro *coro; 3566 struct coro *coro;
3597 for (coro = coro_first; coro; coro = coro->next) 3567 for (coro = coro_first; coro; coro = coro->next)
3598 if (coro->hv) 3568 if (coro->hv)
3599 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3569 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3600} 3570}
3601 3571
… …
3763 3733
3764void 3734void
3765times (Coro::State self) 3735times (Coro::State self)
3766 PPCODE: 3736 PPCODE:
3767{ 3737{
3768 struct coro *current = SvSTATE (coro_current); 3738 struct coro *current = SvSTATE (coro_current);
3769 3739
3770 if (ecb_expect_false (current == self)) 3740 if (ecb_expect_false (current == self))
3771 { 3741 {
3772 coro_times_update (); 3742 coro_times_update ();
3773 coro_times_add (SvSTATE (coro_current)); 3743 coro_times_add (SvSTATE (coro_current));
… …
3816 3786
3817 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);
3818 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3788 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); 3789 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 */ 3790 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3821 3791
3822 coro_stash = gv_stashpv ("Coro", TRUE); 3792 coro_stash = gv_stashpv ("Coro", TRUE);
3823 3793
3824 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3794 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3825 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3795 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3826 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3796 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4048 on_leave = 1 4018 on_leave = 1
4049 PROTOTYPE: & 4019 PROTOTYPE: &
4050 CODE: 4020 CODE:
4051{ 4021{
4052 struct coro *coro = SvSTATE_current; 4022 struct coro *coro = SvSTATE_current;
4053 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4023 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4054 4024
4055 block = s_get_cv_croak (block); 4025 block = s_get_cv_croak (block);
4056 4026
4057 if (!*avp) 4027 if (!*avp)
4058 *avp = newAV (); 4028 *avp = newAV ();
… …
4078 4048
4079SV * 4049SV *
4080new (SV *klass, SV *count = 0) 4050new (SV *klass, SV *count = 0)
4081 CODE: 4051 CODE:
4082{ 4052{
4083 int semcnt = 1; 4053 int semcnt = 1;
4084 4054
4085 if (count) 4055 if (count)
4086 { 4056 {
4087 SvGETMAGIC (count); 4057 SvGETMAGIC (count);
4088 4058
… …
4148 XSRETURN_NO; 4118 XSRETURN_NO;
4149} 4119}
4150 4120
4151void 4121void
4152waiters (SV *self) 4122waiters (SV *self)
4153 PPCODE: 4123 PPCODE:
4154{ 4124{
4155 AV *av = (AV *)SvRV (self); 4125 AV *av = (AV *)SvRV (self);
4156 int wcount = AvFILLp (av) + 1 - 1; 4126 int wcount = AvFILLp (av) + 1 - 1;
4157 4127
4158 if (GIMME_V == G_SCALAR) 4128 if (GIMME_V == G_SCALAR)
… …
4170 4140
4171void 4141void
4172_may_delete (SV *sem, int count, unsigned int extra_refs) 4142_may_delete (SV *sem, int count, unsigned int extra_refs)
4173 PPCODE: 4143 PPCODE:
4174{ 4144{
4175 AV *av = (AV *)SvRV (sem); 4145 AV *av = (AV *)SvRV (sem);
4176 4146
4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4147 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4178 && AvFILLp (av) == 0 /* no waiters, just count */ 4148 && AvFILLp (av) == 0 /* no waiters, just count */
4179 && SvIV (AvARRAY (av)[0]) == count) 4149 && SvIV (AvARRAY (av)[0]) == count)
4180 XSRETURN_YES; 4150 XSRETURN_YES;
… …
4201 4171
4202void 4172void
4203broadcast (SV *self) 4173broadcast (SV *self)
4204 CODE: 4174 CODE:
4205{ 4175{
4206 AV *av = (AV *)SvRV (self); 4176 AV *av = (AV *)SvRV (self);
4207 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4177 coro_signal_wake (aTHX_ av, AvFILLp (av));
4208} 4178}
4209 4179
4210void 4180void
4211send (SV *self) 4181send (SV *self)
… …
4219 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4189 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4220} 4190}
4221 4191
4222IV 4192IV
4223awaited (SV *self) 4193awaited (SV *self)
4224 CODE: 4194 CODE:
4225 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4195 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4226 OUTPUT: 4196 OUTPUT:
4227 RETVAL 4197 RETVAL
4228 4198
4229 4199
… …
4234 4204
4235void 4205void
4236_schedule (...) 4206_schedule (...)
4237 CODE: 4207 CODE:
4238{ 4208{
4239 static int incede; 4209 static int incede;
4240 4210
4241 api_cede_notself (aTHX); 4211 api_cede_notself (aTHX);
4242 4212
4243 ++incede; 4213 ++incede;
4244 while (coro_nready >= incede && api_cede (aTHX)) 4214 while (coro_nready >= incede && api_cede (aTHX))
… …
4288 { 4258 {
4289 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4259 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4290 coro_old_pp_sselect = 0; 4260 coro_old_pp_sselect = 0;
4291 } 4261 }
4292 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