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.436 by root, Tue Nov 5 14:38:46 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
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 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))
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
… …
33# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
34#else 53#else
35# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
36#endif 55#endif
37 56
38#if HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 57/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
67 59
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 61# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
73# undef CORO_STACKGUARD
74#endif
75
76#ifndef CORO_STACKGUARD
77# define CORO_STACKGUARD 0
78#endif 62#endif
79 63
80/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
173typedef struct coro_cctx 157typedef struct coro_cctx
174{ 158{
175 struct coro_cctx *next; 159 struct coro_cctx *next;
176 160
177 /* the stack */ 161 /* the stack */
178 void *sptr; 162 struct coro_stack stack;
179 size_t ssize;
180 163
181 /* cpu state */ 164 /* cpu state */
182 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
183#ifndef NDEBUG 166#ifndef NDEBUG
184 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
293#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
294 277
295/** JIT *********************************************************************/ 278/** JIT *********************************************************************/
296 279
297#if CORO_JIT 280#if CORO_JIT
298 /* APPLE doesn't have HAVE_MMAP though */ 281 /* APPLE doesn't have mmap though */
299 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
300 #ifndef CORO_JIT_TYPE 283 #ifndef CORO_JIT_TYPE
301 #if __x86_64 && CORO_JIT_UNIXY 284 #if ECB_AMD64 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "amd64-unix" 285 #define CORO_JIT_TYPE "amd64-unix"
303 #elif __i386 && CORO_JIT_UNIXY 286 #elif __i386 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "x86-unix" 287 #define CORO_JIT_TYPE "x86-unix"
305 #endif 288 #endif
306 #endif 289 #endif
307#endif 290#endif
308 291
309#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
310 #undef CORO_JIT 293 #undef CORO_JIT
311#endif 294#endif
312 295
313#if CORO_JIT 296#if CORO_JIT
314 typedef void (*load_save_perl_slots_type)(perl_slots *); 297 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
371time_init (pTHX) 354time_init (pTHX)
372{ 355{
373 SV **svp; 356 SV **svp;
374 357
375 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
376 359
377 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
378 361
379 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
380 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");
381 364
… …
522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
523 506
524/*****************************************************************************/ 507/*****************************************************************************/
525/* padlist management and caching */ 508/* padlist management and caching */
526 509
527ecb_inline AV * 510ecb_inline PADLIST *
528coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
529{ 512{
530 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
531 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1;
532 517
533 newpadlist = newAV (); 518#if NEWPADAPI
519
520 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522 while (!PadlistARRAY (padlist)[off - 1])
523 --off;
524
525 Perl_pad_push (aTHX_ padlist, off);
526
527 newpad = PadlistARRAY (padlist)[off];
528 PadlistARRAY (padlist)[off] = 0;
529
530#else
531
532#if PERL_VERSION_ATLEAST (5,10,0)
533 Perl_pad_push (aTHX_ padlist, off);
534#else
535 Perl_pad_push (aTHX_ padlist, off, 1);
536#endif
537
538 newpad = PadlistARRAY (padlist)[off];
539 PadlistMAX (padlist) = off - 1;
540
541#endif
542
543 newPADLIST (newpadlist);
544#if !PERL_VERSION_ATLEAST(5,15,3)
545 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
534 AvREAL_off (newpadlist); 546 AvREAL_off (newpadlist);
535#if PERL_VERSION_ATLEAST (5,10,0)
536 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
537#else
538 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
539#endif 547#endif
540 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
541 --AvFILLp (padlist);
542 548
543 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 549 /* Already extended to 2 elements by newPADLIST. */
544 av_store (newpadlist, 1, (SV *)newpad); 550 PadlistMAX (newpadlist) = 1;
551 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
552 PadlistARRAY (newpadlist)[1] = newpad;
545 553
546 return newpadlist; 554 return newpadlist;
547} 555}
548 556
549ecb_inline void 557ecb_inline void
550free_padlist (pTHX_ AV *padlist) 558free_padlist (pTHX_ PADLIST *padlist)
551{ 559{
552 /* may be during global destruction */ 560 /* may be during global destruction */
553 if (!IN_DESTRUCT) 561 if (!IN_DESTRUCT)
554 { 562 {
555 I32 i = AvFILLp (padlist); 563 I32 i = PadlistMAX (padlist);
556 564
557 while (i > 0) /* special-case index 0 */ 565 while (i > 0) /* special-case index 0 */
558 { 566 {
559 /* we try to be extra-careful here */ 567 /* we try to be extra-careful here */
560 AV *av = (AV *)AvARRAY (padlist)[i--]; 568 PAD *pad = PadlistARRAY (padlist)[i--];
561 I32 j = AvFILLp (av); 569 I32 j = PadMAX (pad);
562 570
563 while (j >= 0) 571 while (j >= 0)
564 SvREFCNT_dec (AvARRAY (av)[j--]); 572 SvREFCNT_dec (PadARRAY (pad)[j--]);
565 573
566 AvFILLp (av) = -1; 574 PadMAX (pad) = -1;
567 SvREFCNT_dec (av); 575 SvREFCNT_dec (pad);
568 } 576 }
569 577
570 SvREFCNT_dec (AvARRAY (padlist)[0]); 578 SvREFCNT_dec (PadlistNAMES (padlist));
571 579
580#if NEWPADAPI
581 Safefree (PadlistARRAY (padlist));
582 Safefree (padlist);
583#else
572 AvFILLp (padlist) = -1; 584 AvFILLp (padlist) = -1;
585 AvREAL_off (padlist);
573 SvREFCNT_dec ((SV*)padlist); 586 SvREFCNT_dec ((SV*)padlist);
587#endif
574 } 588 }
575} 589}
576 590
577static int 591static int
578coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 592coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
579{ 593{
580 AV *padlist; 594 PADLIST *padlist;
581 AV *av = (AV *)mg->mg_obj; 595 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
596 size_t len = *(size_t *)mg->mg_ptr;
582 597
583 /* perl manages to free our internal AV and _then_ call us */ 598 /* perl manages to free our internal AV and _then_ call us */
584 if (IN_DESTRUCT) 599 if (IN_DESTRUCT)
585 return 0; 600 return 0;
586 601
587 /* casting is fun. */ 602 while (len--)
588 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
589 free_padlist (aTHX_ padlist); 603 free_padlist (aTHX_ padlists[len]);
590
591 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
592 604
593 return 0; 605 return 0;
594} 606}
595 607
596static MGVTBL coro_cv_vtbl = { 608static MGVTBL coro_cv_vtbl = {
… …
601/* the next two functions merely cache the padlists */ 613/* the next two functions merely cache the padlists */
602ecb_inline void 614ecb_inline void
603get_padlist (pTHX_ CV *cv) 615get_padlist (pTHX_ CV *cv)
604{ 616{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 617 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 618 size_t *lenp;
607 619
608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 620 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 621 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
610 else 622 else
611 { 623 {
612#if CORO_PREFER_PERL_FUNCTIONS 624#if CORO_PREFER_PERL_FUNCTIONS
613 /* this is probably cleaner? but also slower! */ 625 /* this is probably cleaner? but also slower! */
614 /* in practise, it seems to be less stable */ 626 /* in practise, it seems to be less stable */
… …
624 636
625ecb_inline void 637ecb_inline void
626put_padlist (pTHX_ CV *cv) 638put_padlist (pTHX_ CV *cv)
627{ 639{
628 MAGIC *mg = CORO_MAGIC_cv (cv); 640 MAGIC *mg = CORO_MAGIC_cv (cv);
629 AV *av;
630 641
631 if (ecb_expect_false (!mg)) 642 if (ecb_expect_false (!mg))
643 {
632 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 644 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
645 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
646 mg->mg_len = 1; /* so mg_free frees mg_ptr */
647 }
648 else
649 Renew (mg->mg_ptr,
650 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
651 char);
633 652
634 av = (AV *)mg->mg_obj; 653 ((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} 654}
641 655
642/** load & save, init *******************************************************/ 656/** load & save, init *******************************************************/
643 657
644ecb_inline void 658ecb_inline void
… …
719 /* now do the ugly restore mess */ 733 /* now do the ugly restore mess */
720 while (ecb_expect_true (cv = (CV *)POPs)) 734 while (ecb_expect_true (cv = (CV *)POPs))
721 { 735 {
722 put_padlist (aTHX_ cv); /* mark this padlist as available */ 736 put_padlist (aTHX_ cv); /* mark this padlist as available */
723 CvDEPTH (cv) = PTR2IV (POPs); 737 CvDEPTH (cv) = PTR2IV (POPs);
724 CvPADLIST (cv) = (AV *)POPs; 738 CvPADLIST (cv) = (PADLIST *)POPs;
725 } 739 }
726 740
727 PUTBACK; 741 PUTBACK;
728 } 742 }
729 743
… …
992 { 1006 {
993 SV **svp = 0; 1007 SV **svp = 0;
994 1008
995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1009 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1010 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
997 1011
998 if (svp) 1012 if (svp)
999 { 1013 {
1000 SV *ssv; 1014 SV *ssv;
1001 1015
1002 if (!*svp) 1016 if (!*svp)
… …
1108 PL_hints = 0; 1122 PL_hints = 0;
1109 1123
1110 /* recreate the die/warn hooks */ 1124 /* recreate the die/warn hooks */
1111 PL_diehook = SvREFCNT_inc (rv_diehook); 1125 PL_diehook = SvREFCNT_inc (rv_diehook);
1112 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1126 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1113 1127
1114 GvSV (PL_defgv) = newSV (0); 1128 GvSV (PL_defgv) = newSV (0);
1115 GvAV (PL_defgv) = coro->args; coro->args = 0; 1129 GvAV (PL_defgv) = coro->args; coro->args = 0;
1116 GvSV (PL_errgv) = newSV (0); 1130 GvSV (PL_errgv) = newSV (0);
1117 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1131 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1118 GvHV (PL_hintgv) = 0; 1132 GvHV (PL_hintgv) = 0;
… …
1487static coro_cctx * 1501static coro_cctx *
1488cctx_new_empty (void) 1502cctx_new_empty (void)
1489{ 1503{
1490 coro_cctx *cctx = cctx_new (); 1504 coro_cctx *cctx = cctx_new ();
1491 1505
1492 cctx->sptr = 0; 1506 cctx->stack.sptr = 0;
1493 coro_create (&cctx->cctx, 0, 0, 0, 0); 1507 coro_create (&cctx->cctx, 0, 0, 0, 0);
1494 1508
1495 return cctx; 1509 return cctx;
1496} 1510}
1497 1511
1498/* create a new cctx suitable as destination/running a perl interpreter */ 1512/* create a new cctx suitable as destination/running a perl interpreter */
1499static coro_cctx * 1513static coro_cctx *
1500cctx_new_run (void) 1514cctx_new_run (void)
1501{ 1515{
1502 coro_cctx *cctx = cctx_new (); 1516 coro_cctx *cctx = cctx_new ();
1503 void *stack_start;
1504 size_t stack_size;
1505 1517
1506#if HAVE_MMAP 1518 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1507 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1508 /* 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);
1510
1511 if (cctx->sptr != (void *)-1)
1512 {
1513 #if CORO_STACKGUARD
1514 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1515 #endif
1516 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1517 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1518 cctx->flags |= CC_MAPPED;
1519 } 1519 {
1520 else
1521#endif
1522 {
1523 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1524 New (0, cctx->sptr, cctx_stacksize, long);
1525
1526 if (!cctx->sptr)
1527 {
1528 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1520 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1529 _exit (EXIT_FAILURE); 1521 _exit (EXIT_FAILURE);
1530 }
1531
1532 stack_start = cctx->sptr;
1533 stack_size = cctx->ssize;
1534 } 1522 }
1535 1523
1536 #if CORO_USE_VALGRIND
1537 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1538 #endif
1539
1540 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1524 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1541 1525
1542 return cctx; 1526 return cctx;
1543} 1527}
1544 1528
1545static void 1529static void
… …
1551 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1535 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1552 1536
1553 --cctx_count; 1537 --cctx_count;
1554 coro_destroy (&cctx->cctx); 1538 coro_destroy (&cctx->cctx);
1555 1539
1556 /* coro_transfer creates new, empty cctx's */ 1540 coro_stack_free (&cctx->stack);
1557 if (cctx->sptr)
1558 {
1559 #if CORO_USE_VALGRIND
1560 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1561 #endif
1562
1563#if HAVE_MMAP
1564 if (cctx->flags & CC_MAPPED)
1565 munmap (cctx->sptr, cctx->ssize);
1566 else
1567#endif
1568 Safefree (cctx->sptr);
1569 }
1570 1541
1571 Safefree (cctx); 1542 Safefree (cctx);
1572} 1543}
1573 1544
1574/* wether this cctx should be destructed */ 1545/* wether this cctx should be destructed */
… …
1593} 1564}
1594 1565
1595static void 1566static void
1596cctx_put (coro_cctx *cctx) 1567cctx_put (coro_cctx *cctx)
1597{ 1568{
1598 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1569 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1599 1570
1600 /* free another cctx if overlimit */ 1571 /* free another cctx if overlimit */
1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1572 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1602 { 1573 {
1603 coro_cctx *first = cctx_first; 1574 coro_cctx *first = cctx_first;
… …
1729 return; 1700 return;
1730 1701
1731 slf_destroy (aTHX_ coro); 1702 slf_destroy (aTHX_ coro);
1732 1703
1733 coro->flags |= CF_ZOMBIE; 1704 coro->flags |= CF_ZOMBIE;
1734 1705
1735 if (coro->flags & CF_READY) 1706 if (coro->flags & CF_READY)
1736 { 1707 {
1737 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1708 /* reduce nready, as destroying a ready coro effectively unreadies it */
1738 /* alternative: look through all ready queues and remove the coro */ 1709 /* alternative: look through all ready queues and remove the coro */
1739 --coro_nready; 1710 --coro_nready;
… …
2143 AV *od = coro->on_destroy; 2114 AV *od = coro->on_destroy;
2144 2115
2145 if (!od) 2116 if (!od)
2146 return; 2117 return;
2147 2118
2119 coro->on_destroy = 0;
2120 sv_2mortal ((SV *)od);
2121
2148 while (AvFILLp (od) >= 0) 2122 while (AvFILLp (od) >= 0)
2149 { 2123 {
2150 SV *cb = sv_2mortal (av_pop (od)); 2124 SV *cb = sv_2mortal (av_pop (od));
2151 2125
2152 /* coro hv's (and only hv's at the moment) are supported as well */ 2126 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2172 2146
2173static void 2147static void
2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2148coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2175{ 2149{
2176 AV *av; 2150 AV *av;
2177 2151
2178 if (coro->status) 2152 if (coro->status)
2179 { 2153 {
2180 av = coro->status; 2154 av = coro->status;
2181 av_clear (av); 2155 av_clear (av);
2182 } 2156 }
… …
2229 2203
2230 coro = SvSTATE (arg [0]); 2204 coro = SvSTATE (arg [0]);
2231 coro_hv = coro->hv; 2205 coro_hv = coro->hv;
2232 2206
2233 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2207 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2234 2208
2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2209 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2236 { 2210 {
2237 /* coro currently busy cancelling something, so just notify it */ 2211 /* coro currently busy cancelling something, so just notify it */
2238 coro->slf_frame.data = (void *)coro; 2212 coro->slf_frame.data = (void *)coro;
2239 2213
… …
2418 2392
2419static int 2393static int
2420slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2394slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2421{ 2395{
2422 SV *data = (SV *)frame->data; 2396 SV *data = (SV *)frame->data;
2423 2397
2424 if (CORO_THROW) 2398 if (CORO_THROW)
2425 return 0; 2399 return 0;
2426 2400
2427 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2401 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2428 return 1; 2402 return 1;
… …
2464 cb = sv_2mortal (coro->rouse_cb); 2438 cb = sv_2mortal (coro->rouse_cb);
2465 coro->rouse_cb = 0; 2439 coro->rouse_cb = 0;
2466 } 2440 }
2467 2441
2468 if (!SvROK (cb) 2442 if (!SvROK (cb)
2469 || SvTYPE (SvRV (cb)) != SVt_PVCV 2443 || SvTYPE (SvRV (cb)) != SVt_PVCV
2470 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2444 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2471 croak ("Coro::rouse_wait called with illegal callback argument,"); 2445 croak ("Coro::rouse_wait called with illegal callback argument,");
2472 2446
2473 { 2447 {
2474 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2448 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3195 /* it quickly returns */ 3169 /* it quickly returns */
3196 if (CORO_THROW) 3170 if (CORO_THROW)
3197 return 0; 3171 return 0;
3198 3172
3199 /* one element that is an RV? repeat! */ 3173 /* one element that is an RV? repeat! */
3200 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3174 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3201 return 1; 3175 return 1;
3202 3176
3203 /* restore status */ 3177 /* restore status */
3204 { 3178 {
3205 SV *data_sv = av_pop (state); 3179 SV *data_sv = av_pop (state);
… …
3438#ifdef USE_ITHREADS 3412#ifdef USE_ITHREADS
3439# if CORO_PTHREAD 3413# if CORO_PTHREAD
3440 coro_thx = PERL_GET_CONTEXT; 3414 coro_thx = PERL_GET_CONTEXT;
3441# endif 3415# endif
3442#endif 3416#endif
3443 BOOT_PAGESIZE;
3444
3445 /* perl defines these to check for existance first, but why it doesn't */ 3417 /* perl defines these to check for existance first, but why it doesn't */
3446 /* just create them one at init time is not clear to me, except for */ 3418 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */ 3419 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */ 3420 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV; 3421 DEFSV;
… …
3519void 3491void
3520transfer (...) 3492transfer (...)
3521 PROTOTYPE: $$ 3493 PROTOTYPE: $$
3522 CODE: 3494 CODE:
3523 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3495 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3524
3525void
3526_exit (int code)
3527 PROTOTYPE: $
3528 CODE:
3529 _exit (code);
3530 3496
3531SV * 3497SV *
3532clone (Coro::State coro) 3498clone (Coro::State coro)
3533 CODE: 3499 CODE:
3534{ 3500{
… …
3589void 3555void
3590list () 3556list ()
3591 PROTOTYPE: 3557 PROTOTYPE:
3592 PPCODE: 3558 PPCODE:
3593{ 3559{
3594 struct coro *coro; 3560 struct coro *coro;
3595 for (coro = coro_first; coro; coro = coro->next) 3561 for (coro = coro_first; coro; coro = coro->next)
3596 if (coro->hv) 3562 if (coro->hv)
3597 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3563 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3598} 3564}
3599 3565
… …
3761 3727
3762void 3728void
3763times (Coro::State self) 3729times (Coro::State self)
3764 PPCODE: 3730 PPCODE:
3765{ 3731{
3766 struct coro *current = SvSTATE (coro_current); 3732 struct coro *current = SvSTATE (coro_current);
3767 3733
3768 if (ecb_expect_false (current == self)) 3734 if (ecb_expect_false (current == self))
3769 { 3735 {
3770 coro_times_update (); 3736 coro_times_update ();
3771 coro_times_add (SvSTATE (coro_current)); 3737 coro_times_add (SvSTATE (coro_current));
… …
3814 3780
3815 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3781 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); 3782 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); 3783 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 */ 3784 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3819 3785
3820 coro_stash = gv_stashpv ("Coro", TRUE); 3786 coro_stash = gv_stashpv ("Coro", TRUE);
3821 3787
3822 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3788 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3823 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3789 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3824 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3790 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4046 on_leave = 1 4012 on_leave = 1
4047 PROTOTYPE: & 4013 PROTOTYPE: &
4048 CODE: 4014 CODE:
4049{ 4015{
4050 struct coro *coro = SvSTATE_current; 4016 struct coro *coro = SvSTATE_current;
4051 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4017 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4052 4018
4053 block = s_get_cv_croak (block); 4019 block = s_get_cv_croak (block);
4054 4020
4055 if (!*avp) 4021 if (!*avp)
4056 *avp = newAV (); 4022 *avp = newAV ();
… …
4076 4042
4077SV * 4043SV *
4078new (SV *klass, SV *count = 0) 4044new (SV *klass, SV *count = 0)
4079 CODE: 4045 CODE:
4080{ 4046{
4081 int semcnt = 1; 4047 int semcnt = 1;
4082 4048
4083 if (count) 4049 if (count)
4084 { 4050 {
4085 SvGETMAGIC (count); 4051 SvGETMAGIC (count);
4086 4052
… …
4146 XSRETURN_NO; 4112 XSRETURN_NO;
4147} 4113}
4148 4114
4149void 4115void
4150waiters (SV *self) 4116waiters (SV *self)
4151 PPCODE: 4117 PPCODE:
4152{ 4118{
4153 AV *av = (AV *)SvRV (self); 4119 AV *av = (AV *)SvRV (self);
4154 int wcount = AvFILLp (av) + 1 - 1; 4120 int wcount = AvFILLp (av) + 1 - 1;
4155 4121
4156 if (GIMME_V == G_SCALAR) 4122 if (GIMME_V == G_SCALAR)
… …
4168 4134
4169void 4135void
4170_may_delete (SV *sem, int count, unsigned int extra_refs) 4136_may_delete (SV *sem, int count, unsigned int extra_refs)
4171 PPCODE: 4137 PPCODE:
4172{ 4138{
4173 AV *av = (AV *)SvRV (sem); 4139 AV *av = (AV *)SvRV (sem);
4174 4140
4175 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4141 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4176 && AvFILLp (av) == 0 /* no waiters, just count */ 4142 && AvFILLp (av) == 0 /* no waiters, just count */
4177 && SvIV (AvARRAY (av)[0]) == count) 4143 && SvIV (AvARRAY (av)[0]) == count)
4178 XSRETURN_YES; 4144 XSRETURN_YES;
… …
4199 4165
4200void 4166void
4201broadcast (SV *self) 4167broadcast (SV *self)
4202 CODE: 4168 CODE:
4203{ 4169{
4204 AV *av = (AV *)SvRV (self); 4170 AV *av = (AV *)SvRV (self);
4205 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4171 coro_signal_wake (aTHX_ av, AvFILLp (av));
4206} 4172}
4207 4173
4208void 4174void
4209send (SV *self) 4175send (SV *self)
… …
4217 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4183 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4218} 4184}
4219 4185
4220IV 4186IV
4221awaited (SV *self) 4187awaited (SV *self)
4222 CODE: 4188 CODE:
4223 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4189 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4224 OUTPUT: 4190 OUTPUT:
4225 RETVAL 4191 RETVAL
4226 4192
4227 4193
… …
4232 4198
4233void 4199void
4234_schedule (...) 4200_schedule (...)
4235 CODE: 4201 CODE:
4236{ 4202{
4237 static int incede; 4203 static int incede;
4238 4204
4239 api_cede_notself (aTHX); 4205 api_cede_notself (aTHX);
4240 4206
4241 ++incede; 4207 ++incede;
4242 while (coro_nready >= incede && api_cede (aTHX)) 4208 while (coro_nready >= incede && api_cede (aTHX))
… …
4286 { 4252 {
4287 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4253 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4288 coro_old_pp_sselect = 0; 4254 coro_old_pp_sselect = 0;
4289 } 4255 }
4290 4256
4257MODULE = Coro::State PACKAGE = Coro::Util
4258
4259void
4260_exit (int code)
4261 CODE:
4262 _exit (code);
4263
4264NV
4265time ()
4266 CODE:
4267 RETVAL = nvtime (aTHX);
4268 OUTPUT:
4269 RETVAL
4270
4271NV
4272gettimeofday ()
4273 PPCODE:
4274{
4275 UV tv [2];
4276 u2time (aTHX_ tv);
4277 EXTEND (SP, 2);
4278 PUSHs (sv_2mortal (newSVuv (tv [0])));
4279 PUSHs (sv_2mortal (newSVuv (tv [1])));
4280}
4281

Diff Legend

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