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.435 by root, Sat Nov 2 19:49:33 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 *);
… …
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 off = PadlistMAX (padlist) + 1;
534 517
535 newpadlist = newAV (); 518#if NEWPADAPI
519
520 while (!PadlistARRAY (padlist)[off - 1])
521 --off;
522
523 Perl_pad_push (aTHX_ padlist, off);
524
525 newpad = PadlistARRAY (padlist)[off];
526 PadlistARRAY (padlist)[off] = 0;
527
528#else
529
530#if PERL_VERSION_ATLEAST (5,10,0)
531 Perl_pad_push (aTHX_ padlist, off);
532#else
533 Perl_pad_push (aTHX_ padlist, off, 1);
534#endif
535
536 newpad = PadlistARRAY (padlist)[off];
537 PadlistMAX (padlist) = off - 1;
538
539#endif
540
541 newPADLIST (newpadlist);
542#if !PERL_VERSION_ATLEAST(5,15,3)
543 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
536 AvREAL_off (newpadlist); 544 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 545#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
543 --AvFILLp (padlist);
544 546
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 547 /* Already extended to 2 elements by newPADLIST. */
546 av_store (newpadlist, 1, (SV *)newpad); 548 PadlistMAX (newpadlist) = 1;
549 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
550 PadlistARRAY (newpadlist)[1] = newpad;
547 551
548 return newpadlist; 552 return newpadlist;
549} 553}
550 554
551ecb_inline void 555ecb_inline void
552free_padlist (pTHX_ AV *padlist) 556free_padlist (pTHX_ PADLIST *padlist)
553{ 557{
554 /* may be during global destruction */ 558 /* may be during global destruction */
555 if (!IN_DESTRUCT) 559 if (!IN_DESTRUCT)
556 { 560 {
557 I32 i = AvFILLp (padlist); 561 I32 i = PadlistMAX (padlist);
558 562
559 while (i > 0) /* special-case index 0 */ 563 while (i > 0) /* special-case index 0 */
560 { 564 {
561 /* we try to be extra-careful here */ 565 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 566 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av); 567 I32 j = PadMAX (pad);
564 568
565 while (j >= 0) 569 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 570 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 571
568 AvFILLp (av) = -1; 572 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 573 SvREFCNT_dec (pad);
570 } 574 }
571 575
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 576 SvREFCNT_dec (PadlistNAMES (padlist));
573 577
578#if NEWPADAPI
579 Safefree (PadlistARRAY (padlist));
580 Safefree (padlist);
581#else
574 AvFILLp (padlist) = -1; 582 AvFILLp (padlist) = -1;
583 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 584 SvREFCNT_dec ((SV*)padlist);
585#endif
576 } 586 }
577} 587}
578 588
579static int 589static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 590coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 591{
582 AV *padlist; 592 PADLIST *padlist;
583 AV *av = (AV *)mg->mg_obj; 593 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
594 size_t len = *(size_t *)mg->mg_ptr;
584 595
585 /* perl manages to free our internal AV and _then_ call us */ 596 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 597 if (IN_DESTRUCT)
587 return 0; 598 return 0;
588 599
589 /* casting is fun. */ 600 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 601 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 602
595 return 0; 603 return 0;
596} 604}
597 605
598static MGVTBL coro_cv_vtbl = { 606static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 611/* the next two functions merely cache the padlists */
604ecb_inline void 612ecb_inline void
605get_padlist (pTHX_ CV *cv) 613get_padlist (pTHX_ CV *cv)
606{ 614{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 615 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 616 size_t *lenp;
609 617
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 618 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 619 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 620 else
613 { 621 {
614#if CORO_PREFER_PERL_FUNCTIONS 622#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 623 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 624 /* in practise, it seems to be less stable */
… …
626 634
627ecb_inline void 635ecb_inline void
628put_padlist (pTHX_ CV *cv) 636put_padlist (pTHX_ CV *cv)
629{ 637{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 638 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 639
633 if (ecb_expect_false (!mg)) 640 if (ecb_expect_false (!mg))
641 {
634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 642 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
643 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
644 mg->mg_len = 1; /* so mg_free frees mg_ptr */
645 }
646 else
647 Renew (mg->mg_ptr,
648 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
649 char);
635 650
636 av = (AV *)mg->mg_obj; 651 ((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} 652}
643 653
644/** load & save, init *******************************************************/ 654/** load & save, init *******************************************************/
645 655
646ecb_inline void 656ecb_inline void
… …
721 /* now do the ugly restore mess */ 731 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 732 while (ecb_expect_true (cv = (CV *)POPs))
723 { 733 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 734 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 735 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 736 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 737 }
728 738
729 PUTBACK; 739 PUTBACK;
730 } 740 }
731 741
… …
994 { 1004 {
995 SV **svp = 0; 1005 SV **svp = 0;
996 1006
997 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1007 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
998 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1008 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
999 1009
1000 if (svp) 1010 if (svp)
1001 { 1011 {
1002 SV *ssv; 1012 SV *ssv;
1003 1013
1004 if (!*svp) 1014 if (!*svp)
… …
1110 PL_hints = 0; 1120 PL_hints = 0;
1111 1121
1112 /* recreate the die/warn hooks */ 1122 /* recreate the die/warn hooks */
1113 PL_diehook = SvREFCNT_inc (rv_diehook); 1123 PL_diehook = SvREFCNT_inc (rv_diehook);
1114 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1124 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1115 1125
1116 GvSV (PL_defgv) = newSV (0); 1126 GvSV (PL_defgv) = newSV (0);
1117 GvAV (PL_defgv) = coro->args; coro->args = 0; 1127 GvAV (PL_defgv) = coro->args; coro->args = 0;
1118 GvSV (PL_errgv) = newSV (0); 1128 GvSV (PL_errgv) = newSV (0);
1119 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1129 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1120 GvHV (PL_hintgv) = 0; 1130 GvHV (PL_hintgv) = 0;
… …
1489static coro_cctx * 1499static coro_cctx *
1490cctx_new_empty (void) 1500cctx_new_empty (void)
1491{ 1501{
1492 coro_cctx *cctx = cctx_new (); 1502 coro_cctx *cctx = cctx_new ();
1493 1503
1494 cctx->sptr = 0; 1504 cctx->stack.sptr = 0;
1495 coro_create (&cctx->cctx, 0, 0, 0, 0); 1505 coro_create (&cctx->cctx, 0, 0, 0, 0);
1496 1506
1497 return cctx; 1507 return cctx;
1498} 1508}
1499 1509
1500/* create a new cctx suitable as destination/running a perl interpreter */ 1510/* create a new cctx suitable as destination/running a perl interpreter */
1501static coro_cctx * 1511static coro_cctx *
1502cctx_new_run (void) 1512cctx_new_run (void)
1503{ 1513{
1504 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1505 void *stack_start;
1506 size_t stack_size;
1507 1515
1508#if HAVE_MMAP 1516 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 } 1517 {
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."); 1518 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1531 _exit (EXIT_FAILURE); 1519 _exit (EXIT_FAILURE);
1532 }
1533
1534 stack_start = cctx->sptr;
1535 stack_size = cctx->ssize;
1536 } 1520 }
1537 1521
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); 1522 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1543 1523
1544 return cctx; 1524 return cctx;
1545} 1525}
1546 1526
1547static void 1527static void
… …
1553 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1533 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1554 1534
1555 --cctx_count; 1535 --cctx_count;
1556 coro_destroy (&cctx->cctx); 1536 coro_destroy (&cctx->cctx);
1557 1537
1558 /* coro_transfer creates new, empty cctx's */ 1538 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 1539
1573 Safefree (cctx); 1540 Safefree (cctx);
1574} 1541}
1575 1542
1576/* wether this cctx should be destructed */ 1543/* wether this cctx should be destructed */
… …
1595} 1562}
1596 1563
1597static void 1564static void
1598cctx_put (coro_cctx *cctx) 1565cctx_put (coro_cctx *cctx)
1599{ 1566{
1600 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1567 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1601 1568
1602 /* free another cctx if overlimit */ 1569 /* free another cctx if overlimit */
1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1570 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1604 { 1571 {
1605 coro_cctx *first = cctx_first; 1572 coro_cctx *first = cctx_first;
… …
1731 return; 1698 return;
1732 1699
1733 slf_destroy (aTHX_ coro); 1700 slf_destroy (aTHX_ coro);
1734 1701
1735 coro->flags |= CF_ZOMBIE; 1702 coro->flags |= CF_ZOMBIE;
1736 1703
1737 if (coro->flags & CF_READY) 1704 if (coro->flags & CF_READY)
1738 { 1705 {
1739 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1706 /* reduce nready, as destroying a ready coro effectively unreadies it */
1740 /* alternative: look through all ready queues and remove the coro */ 1707 /* alternative: look through all ready queues and remove the coro */
1741 --coro_nready; 1708 --coro_nready;
… …
2145 AV *od = coro->on_destroy; 2112 AV *od = coro->on_destroy;
2146 2113
2147 if (!od) 2114 if (!od)
2148 return; 2115 return;
2149 2116
2117 coro->on_destroy = 0;
2118 sv_2mortal ((SV *)od);
2119
2150 while (AvFILLp (od) >= 0) 2120 while (AvFILLp (od) >= 0)
2151 { 2121 {
2152 SV *cb = sv_2mortal (av_pop (od)); 2122 SV *cb = sv_2mortal (av_pop (od));
2153 2123
2154 /* coro hv's (and only hv's at the moment) are supported as well */ 2124 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2174 2144
2175static void 2145static void
2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2177{ 2147{
2178 AV *av; 2148 AV *av;
2179 2149
2180 if (coro->status) 2150 if (coro->status)
2181 { 2151 {
2182 av = coro->status; 2152 av = coro->status;
2183 av_clear (av); 2153 av_clear (av);
2184 } 2154 }
… …
2231 2201
2232 coro = SvSTATE (arg [0]); 2202 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv; 2203 coro_hv = coro->hv;
2234 2204
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2205 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236 2206
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 { 2208 {
2239 /* coro currently busy cancelling something, so just notify it */ 2209 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro; 2210 coro->slf_frame.data = (void *)coro;
2241 2211
… …
2420 2390
2421static int 2391static int
2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2423{ 2393{
2424 SV *data = (SV *)frame->data; 2394 SV *data = (SV *)frame->data;
2425 2395
2426 if (CORO_THROW) 2396 if (CORO_THROW)
2427 return 0; 2397 return 0;
2428 2398
2429 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2399 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2430 return 1; 2400 return 1;
… …
2466 cb = sv_2mortal (coro->rouse_cb); 2436 cb = sv_2mortal (coro->rouse_cb);
2467 coro->rouse_cb = 0; 2437 coro->rouse_cb = 0;
2468 } 2438 }
2469 2439
2470 if (!SvROK (cb) 2440 if (!SvROK (cb)
2471 || SvTYPE (SvRV (cb)) != SVt_PVCV 2441 || SvTYPE (SvRV (cb)) != SVt_PVCV
2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2473 croak ("Coro::rouse_wait called with illegal callback argument,"); 2443 croak ("Coro::rouse_wait called with illegal callback argument,");
2474 2444
2475 { 2445 {
2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3197 /* it quickly returns */ 3167 /* it quickly returns */
3198 if (CORO_THROW) 3168 if (CORO_THROW)
3199 return 0; 3169 return 0;
3200 3170
3201 /* one element that is an RV? repeat! */ 3171 /* one element that is an RV? repeat! */
3202 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3172 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3203 return 1; 3173 return 1;
3204 3174
3205 /* restore status */ 3175 /* restore status */
3206 { 3176 {
3207 SV *data_sv = av_pop (state); 3177 SV *data_sv = av_pop (state);
… …
3440#ifdef USE_ITHREADS 3410#ifdef USE_ITHREADS
3441# if CORO_PTHREAD 3411# if CORO_PTHREAD
3442 coro_thx = PERL_GET_CONTEXT; 3412 coro_thx = PERL_GET_CONTEXT;
3443# endif 3413# endif
3444#endif 3414#endif
3445 BOOT_PAGESIZE;
3446
3447 /* perl defines these to check for existance first, but why it doesn't */ 3415 /* 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 */ 3416 /* just create them one at init time is not clear to me, except for */
3449 /* programs trying to delete them, but... */ 3417 /* programs trying to delete them, but... */
3450 /* anyway, we declare this as invalid and make sure they are initialised here */ 3418 /* anyway, we declare this as invalid and make sure they are initialised here */
3451 DEFSV; 3419 DEFSV;
… …
3521void 3489void
3522transfer (...) 3490transfer (...)
3523 PROTOTYPE: $$ 3491 PROTOTYPE: $$
3524 CODE: 3492 CODE:
3525 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3493 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3526
3527void
3528_exit (int code)
3529 PROTOTYPE: $
3530 CODE:
3531 _exit (code);
3532 3494
3533SV * 3495SV *
3534clone (Coro::State coro) 3496clone (Coro::State coro)
3535 CODE: 3497 CODE:
3536{ 3498{
… …
3591void 3553void
3592list () 3554list ()
3593 PROTOTYPE: 3555 PROTOTYPE:
3594 PPCODE: 3556 PPCODE:
3595{ 3557{
3596 struct coro *coro; 3558 struct coro *coro;
3597 for (coro = coro_first; coro; coro = coro->next) 3559 for (coro = coro_first; coro; coro = coro->next)
3598 if (coro->hv) 3560 if (coro->hv)
3599 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3600} 3562}
3601 3563
… …
3763 3725
3764void 3726void
3765times (Coro::State self) 3727times (Coro::State self)
3766 PPCODE: 3728 PPCODE:
3767{ 3729{
3768 struct coro *current = SvSTATE (coro_current); 3730 struct coro *current = SvSTATE (coro_current);
3769 3731
3770 if (ecb_expect_false (current == self)) 3732 if (ecb_expect_false (current == self))
3771 { 3733 {
3772 coro_times_update (); 3734 coro_times_update ();
3773 coro_times_add (SvSTATE (coro_current)); 3735 coro_times_add (SvSTATE (coro_current));
… …
3816 3778
3817 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3779 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); 3780 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); 3781 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 */ 3782 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3821 3783
3822 coro_stash = gv_stashpv ("Coro", TRUE); 3784 coro_stash = gv_stashpv ("Coro", TRUE);
3823 3785
3824 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3786 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3825 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3787 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3826 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3788 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4048 on_leave = 1 4010 on_leave = 1
4049 PROTOTYPE: & 4011 PROTOTYPE: &
4050 CODE: 4012 CODE:
4051{ 4013{
4052 struct coro *coro = SvSTATE_current; 4014 struct coro *coro = SvSTATE_current;
4053 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4015 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4054 4016
4055 block = s_get_cv_croak (block); 4017 block = s_get_cv_croak (block);
4056 4018
4057 if (!*avp) 4019 if (!*avp)
4058 *avp = newAV (); 4020 *avp = newAV ();
… …
4078 4040
4079SV * 4041SV *
4080new (SV *klass, SV *count = 0) 4042new (SV *klass, SV *count = 0)
4081 CODE: 4043 CODE:
4082{ 4044{
4083 int semcnt = 1; 4045 int semcnt = 1;
4084 4046
4085 if (count) 4047 if (count)
4086 { 4048 {
4087 SvGETMAGIC (count); 4049 SvGETMAGIC (count);
4088 4050
… …
4148 XSRETURN_NO; 4110 XSRETURN_NO;
4149} 4111}
4150 4112
4151void 4113void
4152waiters (SV *self) 4114waiters (SV *self)
4153 PPCODE: 4115 PPCODE:
4154{ 4116{
4155 AV *av = (AV *)SvRV (self); 4117 AV *av = (AV *)SvRV (self);
4156 int wcount = AvFILLp (av) + 1 - 1; 4118 int wcount = AvFILLp (av) + 1 - 1;
4157 4119
4158 if (GIMME_V == G_SCALAR) 4120 if (GIMME_V == G_SCALAR)
… …
4170 4132
4171void 4133void
4172_may_delete (SV *sem, int count, unsigned int extra_refs) 4134_may_delete (SV *sem, int count, unsigned int extra_refs)
4173 PPCODE: 4135 PPCODE:
4174{ 4136{
4175 AV *av = (AV *)SvRV (sem); 4137 AV *av = (AV *)SvRV (sem);
4176 4138
4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4139 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4178 && AvFILLp (av) == 0 /* no waiters, just count */ 4140 && AvFILLp (av) == 0 /* no waiters, just count */
4179 && SvIV (AvARRAY (av)[0]) == count) 4141 && SvIV (AvARRAY (av)[0]) == count)
4180 XSRETURN_YES; 4142 XSRETURN_YES;
… …
4201 4163
4202void 4164void
4203broadcast (SV *self) 4165broadcast (SV *self)
4204 CODE: 4166 CODE:
4205{ 4167{
4206 AV *av = (AV *)SvRV (self); 4168 AV *av = (AV *)SvRV (self);
4207 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4169 coro_signal_wake (aTHX_ av, AvFILLp (av));
4208} 4170}
4209 4171
4210void 4172void
4211send (SV *self) 4173send (SV *self)
… …
4219 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4181 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4220} 4182}
4221 4183
4222IV 4184IV
4223awaited (SV *self) 4185awaited (SV *self)
4224 CODE: 4186 CODE:
4225 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4187 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4226 OUTPUT: 4188 OUTPUT:
4227 RETVAL 4189 RETVAL
4228 4190
4229 4191
… …
4234 4196
4235void 4197void
4236_schedule (...) 4198_schedule (...)
4237 CODE: 4199 CODE:
4238{ 4200{
4239 static int incede; 4201 static int incede;
4240 4202
4241 api_cede_notself (aTHX); 4203 api_cede_notself (aTHX);
4242 4204
4243 ++incede; 4205 ++incede;
4244 while (coro_nready >= incede && api_cede (aTHX)) 4206 while (coro_nready >= incede && api_cede (aTHX))
… …
4288 { 4250 {
4289 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4251 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4290 coro_old_pp_sselect = 0; 4252 coro_old_pp_sselect = 0;
4291 } 4253 }
4292 4254
4255MODULE = Coro::State PACKAGE = Coro::Util
4256
4257void
4258_exit (int code)
4259 CODE:
4260 _exit (code);
4261
4262NV
4263time ()
4264 CODE:
4265 RETVAL = nvtime (aTHX);
4266 OUTPUT:
4267 RETVAL
4268
4269NV
4270gettimeofday ()
4271 PPCODE:
4272{
4273 UV tv [2];
4274 u2time (aTHX_ tv);
4275 EXTEND (SP, 2);
4276 PUSHs (sv_2mortal (newSVuv (tv [0])));
4277 PUSHs (sv_2mortal (newSVuv (tv [1])));
4278}
4279

Diff Legend

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