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.446 by root, Wed Sep 3 14:26:34 2014 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
… …
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1 18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
19#include "ecb.h" 20#include "ecb.h"
20 21
21#include <stddef.h> 22#include <stddef.h>
22#include <stdio.h> 23#include <stdio.h>
23#include <errno.h> 24#include <errno.h>
24#include <assert.h> 25#include <assert.h>
25 26
26#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
28#endif 52#endif
29 53
30#if defined(_WIN32) 54#if defined(_WIN32)
31# undef HAS_GETTIMEOFDAY 55# undef HAS_GETTIMEOFDAY
32# undef setjmp 56# undef setjmp
… …
35# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
36#else 60#else
37# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
38#endif 62#endif
39 63
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 */ 64/* the maximum number of idle cctx that will be pooled */
68static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
69 66
70#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
71# define HAS_SCOPESTACK_NAME 1 68# 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 69#endif
81 70
82/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
83#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
84# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
175typedef struct coro_cctx 164typedef struct coro_cctx
176{ 165{
177 struct coro_cctx *next; 166 struct coro_cctx *next;
178 167
179 /* the stack */ 168 /* the stack */
180 void *sptr; 169 struct coro_stack stack;
181 size_t ssize;
182 170
183 /* cpu state */ 171 /* cpu state */
184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG 173#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
295#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
296 284
297/** JIT *********************************************************************/ 285/** JIT *********************************************************************/
298 286
299#if CORO_JIT 287#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */ 288 /* APPLE doesn't have mmap though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE 290 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY 291 #if ECB_AMD64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix" 292 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY 293 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix" 294 #define CORO_JIT_TYPE "x86-unix"
307 #endif 295 #endif
308 #endif 296 #endif
309#endif 297#endif
310 298
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
312 #undef CORO_JIT 300 #undef CORO_JIT
313#endif 301#endif
314 302
315#if CORO_JIT 303#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *); 304 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
373time_init (pTHX) 361time_init (pTHX)
374{ 362{
375 SV **svp; 363 SV **svp;
376 364
377 require_pv ("Time/HiRes.pm"); 365 require_pv ("Time/HiRes.pm");
378 366
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380 368
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383 371
… …
524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
525 513
526/*****************************************************************************/ 514/*****************************************************************************/
527/* padlist management and caching */ 515/* padlist management and caching */
528 516
529ecb_inline AV * 517ecb_inline PADLIST *
530coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
531{ 519{
532 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
533 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
534 524
535 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
536 AvREAL_off (newpadlist); 553 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 554#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
543 --AvFILLp (padlist);
544 555
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
546 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
547 560
548 return newpadlist; 561 return newpadlist;
549} 562}
550 563
551ecb_inline void 564ecb_inline void
552free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
553{ 566{
554 /* may be during global destruction */ 567 /* may be during global destruction */
555 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
556 { 569 {
557 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
558 571
559 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
560 { 573 {
561 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av);
564 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
565 while (j >= 0) 581 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 583
568 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
570 } 587 }
571 588
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
573 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
574 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
576 } 599 }
577} 600}
578 601
579static int 602static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 604{
582 AV *padlist; 605 PADLIST *padlist;
583 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
584 608
585 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
587 return 0; 611 return 0;
588 612
589 /* casting is fun. */ 613 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 615
595 return 0; 616 return 0;
596} 617}
597 618
598static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
604ecb_inline void 625ecb_inline void
605get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
606{ 627{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 629 size_t *lenp;
609 630
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 633 else
613 { 634 {
614#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
626 647
627ecb_inline void 648ecb_inline void
628put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
629{ 650{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 652
633 if (ecb_expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
635 663
636 av = (AV *)mg->mg_obj; 664 ((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} 665}
643 666
644/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
645 668
646ecb_inline void 669ecb_inline void
… …
721 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
723 { 746 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 750 }
728 751
729 PUTBACK; 752 PUTBACK;
730 } 753 }
731 754
… …
994 { 1017 {
995 SV **svp = 0; 1018 SV **svp = 0;
996 1019
997 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
998 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
999 1022
1000 if (svp) 1023 if (svp)
1001 { 1024 {
1002 SV *ssv; 1025 SV *ssv;
1003 1026
1004 if (!*svp) 1027 if (!*svp)
… …
1110 PL_hints = 0; 1133 PL_hints = 0;
1111 1134
1112 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1113 PL_diehook = SvREFCNT_inc (rv_diehook); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1114 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1115 1138
1116 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1117 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1118 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1119 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1120 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = newHV ();
1144#if PERL_VERSION_ATLEAST (5,10,0)
1145 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1146#endif
1121 PL_rs = newSVsv (GvSV (irsgv)); 1147 PL_rs = newSVsv (GvSV (irsgv));
1122 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1148 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1123 1149
1124 { 1150 {
1125 dSP; 1151 dSP;
… …
1489static coro_cctx * 1515static coro_cctx *
1490cctx_new_empty (void) 1516cctx_new_empty (void)
1491{ 1517{
1492 coro_cctx *cctx = cctx_new (); 1518 coro_cctx *cctx = cctx_new ();
1493 1519
1494 cctx->sptr = 0; 1520 cctx->stack.sptr = 0;
1495 coro_create (&cctx->cctx, 0, 0, 0, 0); 1521 coro_create (&cctx->cctx, 0, 0, 0, 0);
1496 1522
1497 return cctx; 1523 return cctx;
1498} 1524}
1499 1525
1500/* create a new cctx suitable as destination/running a perl interpreter */ 1526/* create a new cctx suitable as destination/running a perl interpreter */
1501static coro_cctx * 1527static coro_cctx *
1502cctx_new_run (void) 1528cctx_new_run (void)
1503{ 1529{
1504 coro_cctx *cctx = cctx_new (); 1530 coro_cctx *cctx = cctx_new ();
1505 void *stack_start;
1506 size_t stack_size;
1507 1531
1508#if HAVE_MMAP 1532 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 } 1533 {
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."); 1534 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1531 _exit (EXIT_FAILURE); 1535 _exit (EXIT_FAILURE);
1532 }
1533
1534 stack_start = cctx->sptr;
1535 stack_size = cctx->ssize;
1536 } 1536 }
1537 1537
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); 1538 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1543 1539
1544 return cctx; 1540 return cctx;
1545} 1541}
1546 1542
1547static void 1543static void
… …
1553 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1554 1550
1555 --cctx_count; 1551 --cctx_count;
1556 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1557 1553
1558 /* coro_transfer creates new, empty cctx's */ 1554 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 1555
1573 Safefree (cctx); 1556 Safefree (cctx);
1574} 1557}
1575 1558
1576/* wether this cctx should be destructed */ 1559/* wether this cctx should be destructed */
… …
1595} 1578}
1596 1579
1597static void 1580static void
1598cctx_put (coro_cctx *cctx) 1581cctx_put (coro_cctx *cctx)
1599{ 1582{
1600 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1583 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1601 1584
1602 /* free another cctx if overlimit */ 1585 /* free another cctx if overlimit */
1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1586 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1604 { 1587 {
1605 coro_cctx *first = cctx_first; 1588 coro_cctx *first = cctx_first;
… …
1731 return; 1714 return;
1732 1715
1733 slf_destroy (aTHX_ coro); 1716 slf_destroy (aTHX_ coro);
1734 1717
1735 coro->flags |= CF_ZOMBIE; 1718 coro->flags |= CF_ZOMBIE;
1736 1719
1737 if (coro->flags & CF_READY) 1720 if (coro->flags & CF_READY)
1738 { 1721 {
1739 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1722 /* reduce nready, as destroying a ready coro effectively unreadies it */
1740 /* alternative: look through all ready queues and remove the coro */ 1723 /* alternative: look through all ready queues and remove the coro */
1741 --coro_nready; 1724 --coro_nready;
… …
1937 /* nothing to schedule: call the idle handler */ 1920 /* nothing to schedule: call the idle handler */
1938 if (SvROK (sv_idle) 1921 if (SvROK (sv_idle)
1939 && SvOBJECT (SvRV (sv_idle))) 1922 && SvOBJECT (SvRV (sv_idle)))
1940 { 1923 {
1941 if (SvRV (sv_idle) == SvRV (coro_current)) 1924 if (SvRV (sv_idle) == SvRV (coro_current))
1925 {
1926 require_pv ("Carp");
1927
1928 {
1929 dSP;
1930
1931 ENTER;
1932 SAVETMPS;
1933
1934 PUSHMARK (SP);
1942 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1935 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1936 PUTBACK;
1937 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1938
1939 FREETMPS;
1940 LEAVE;
1941 }
1942 }
1943 1943
1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1945 api_ready (aTHX_ SvRV (sv_idle)); 1945 api_ready (aTHX_ SvRV (sv_idle));
1946 --coro_nready; 1946 --coro_nready;
1947 } 1947 }
… …
2145 AV *od = coro->on_destroy; 2145 AV *od = coro->on_destroy;
2146 2146
2147 if (!od) 2147 if (!od)
2148 return; 2148 return;
2149 2149
2150 coro->on_destroy = 0;
2151 sv_2mortal ((SV *)od);
2152
2150 while (AvFILLp (od) >= 0) 2153 while (AvFILLp (od) >= 0)
2151 { 2154 {
2152 SV *cb = sv_2mortal (av_pop (od)); 2155 SV *cb = sv_2mortal (av_pop (od));
2153 2156
2154 /* coro hv's (and only hv's at the moment) are supported as well */ 2157 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2174 2177
2175static void 2178static void
2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2179coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2177{ 2180{
2178 AV *av; 2181 AV *av;
2179 2182
2180 if (coro->status) 2183 if (coro->status)
2181 { 2184 {
2182 av = coro->status; 2185 av = coro->status;
2183 av_clear (av); 2186 av_clear (av);
2184 } 2187 }
… …
2231 2234
2232 coro = SvSTATE (arg [0]); 2235 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv; 2236 coro_hv = coro->hv;
2234 2237
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2238 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236 2239
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2240 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 { 2241 {
2239 /* coro currently busy cancelling something, so just notify it */ 2242 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro; 2243 coro->slf_frame.data = (void *)coro;
2241 2244
… …
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2251 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 } 2252 }
2250 else 2253 else
2251 { 2254 {
2252 struct coro *self = SvSTATE_current; 2255 struct coro *self = SvSTATE_current;
2256
2257 if (!self)
2258 croak ("Coro::cancel called outside of thread content,");
2253 2259
2254 /* otherwise we cancel directly, purely for speed reasons 2260 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as 2261 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation. 2262 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed. 2263 * this is ugly, and hopefully fully worth the extra speed.
… …
2420 2426
2421static int 2427static int
2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2428slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2423{ 2429{
2424 SV *data = (SV *)frame->data; 2430 SV *data = (SV *)frame->data;
2425 2431
2426 if (CORO_THROW) 2432 if (CORO_THROW)
2427 return 0; 2433 return 0;
2428 2434
2429 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2435 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2430 return 1; 2436 return 1;
… …
2466 cb = sv_2mortal (coro->rouse_cb); 2472 cb = sv_2mortal (coro->rouse_cb);
2467 coro->rouse_cb = 0; 2473 coro->rouse_cb = 0;
2468 } 2474 }
2469 2475
2470 if (!SvROK (cb) 2476 if (!SvROK (cb)
2471 || SvTYPE (SvRV (cb)) != SVt_PVCV 2477 || SvTYPE (SvRV (cb)) != SVt_PVCV
2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2478 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2473 croak ("Coro::rouse_wait called with illegal callback argument,"); 2479 croak ("Coro::rouse_wait called with illegal callback argument,");
2474 2480
2475 { 2481 {
2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2482 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2599 2605
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2606/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void 2607static void
2602slf_destroy (pTHX_ struct coro *coro) 2608slf_destroy (pTHX_ struct coro *coro)
2603{ 2609{
2604 /* this callback is reserved for slf functions needing to do cleanup */ 2610 struct CoroSLF frame = coro->slf_frame;
2605 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2606 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2607 2611
2608 /* 2612 /*
2609 * The on_destroy above most likely is from an SLF call. 2613 * The on_destroy below most likely is from an SLF call.
2610 * Since by definition the SLF call will not finish when we destroy 2614 * Since by definition the SLF call will not finish when we destroy
2611 * the coro, we will have to force-finish it here, otherwise 2615 * the coro, we will have to force-finish it here, otherwise
2612 * cleanup functions cannot call SLF functions. 2616 * cleanup functions cannot call SLF functions.
2613 */ 2617 */
2614 coro->slf_frame.prepare = 0; 2618 coro->slf_frame.prepare = 0;
2619
2620 /* this callback is reserved for slf functions needing to do cleanup */
2621 if (frame.destroy && frame.prepare && !PL_dirty)
2622 frame.destroy (aTHX_ &frame);
2615} 2623}
2616 2624
2617/* 2625/*
2618 * these not obviously related functions are all rolled into one 2626 * these not obviously related functions are all rolled into one
2619 * function to increase chances that they all will call transfer with the same 2627 * function to increase chances that they all will call transfer with the same
… …
2959{ 2967{
2960 AV *av = (AV *)frame->data; 2968 AV *av = (AV *)frame->data;
2961 SV *count_sv = AvARRAY (av)[0]; 2969 SV *count_sv = AvARRAY (av)[0];
2962 SV *coro_hv = SvRV (coro_current); 2970 SV *coro_hv = SvRV (coro_current);
2963 2971
2972 frame->destroy = 0;
2973
2964 /* if we are about to throw, don't actually acquire the lock, just throw */ 2974 /* if we are about to throw, don't actually acquire the lock, just throw */
2965 if (CORO_THROW) 2975 if (ecb_expect_false (CORO_THROW))
2976 {
2977 /* we still might be responsible for the semaphore, so wake up others */
2978 coro_semaphore_adjust (aTHX_ av, 0);
2979
2966 return 0; 2980 return 0;
2981 }
2967 else if (SvIVX (count_sv) > 0) 2982 else if (SvIVX (count_sv) > 0)
2968 { 2983 {
2969 frame->destroy = 0;
2970
2971 if (acquire) 2984 if (acquire)
2972 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2985 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2973 else 2986 else
2974 coro_semaphore_adjust (aTHX_ av, 0); 2987 coro_semaphore_adjust (aTHX_ av, 0);
2975 2988
… …
3197 /* it quickly returns */ 3210 /* it quickly returns */
3198 if (CORO_THROW) 3211 if (CORO_THROW)
3199 return 0; 3212 return 0;
3200 3213
3201 /* one element that is an RV? repeat! */ 3214 /* one element that is an RV? repeat! */
3202 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3215 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3203 return 1; 3216 return 1;
3204 3217
3205 /* restore status */ 3218 /* restore status */
3206 { 3219 {
3207 SV *data_sv = av_pop (state); 3220 SV *data_sv = av_pop (state);
… …
3435 3448
3436PROTOTYPES: DISABLE 3449PROTOTYPES: DISABLE
3437 3450
3438BOOT: 3451BOOT:
3439{ 3452{
3453#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3454#include "state.h"
3440#ifdef USE_ITHREADS 3455#ifdef USE_ITHREADS
3441# if CORO_PTHREAD 3456# if CORO_PTHREAD
3442 coro_thx = PERL_GET_CONTEXT; 3457 coro_thx = PERL_GET_CONTEXT;
3443# endif 3458# endif
3444#endif 3459#endif
3445 BOOT_PAGESIZE;
3446
3447 /* perl defines these to check for existance first, but why it doesn't */ 3460 /* 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 */ 3461 /* just create them one at init time is not clear to me, except for */
3449 /* programs trying to delete them, but... */ 3462 /* programs trying to delete them, but... */
3450 /* anyway, we declare this as invalid and make sure they are initialised here */ 3463 /* anyway, we declare this as invalid and make sure they are initialised here */
3451 DEFSV; 3464 DEFSV;
… …
3521void 3534void
3522transfer (...) 3535transfer (...)
3523 PROTOTYPE: $$ 3536 PROTOTYPE: $$
3524 CODE: 3537 CODE:
3525 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3538 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3526
3527void
3528_exit (int code)
3529 PROTOTYPE: $
3530 CODE:
3531 _exit (code);
3532 3539
3533SV * 3540SV *
3534clone (Coro::State coro) 3541clone (Coro::State coro)
3535 CODE: 3542 CODE:
3536{ 3543{
… …
3591void 3598void
3592list () 3599list ()
3593 PROTOTYPE: 3600 PROTOTYPE:
3594 PPCODE: 3601 PPCODE:
3595{ 3602{
3596 struct coro *coro; 3603 struct coro *coro;
3597 for (coro = coro_first; coro; coro = coro->next) 3604 for (coro = coro_first; coro; coro = coro->next)
3598 if (coro->hv) 3605 if (coro->hv)
3599 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3606 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3600} 3607}
3601 3608
… …
3763 3770
3764void 3771void
3765times (Coro::State self) 3772times (Coro::State self)
3766 PPCODE: 3773 PPCODE:
3767{ 3774{
3768 struct coro *current = SvSTATE (coro_current); 3775 struct coro *current = SvSTATE (coro_current);
3769 3776
3770 if (ecb_expect_false (current == self)) 3777 if (ecb_expect_false (current == self))
3771 { 3778 {
3772 coro_times_update (); 3779 coro_times_update ();
3773 coro_times_add (SvSTATE (coro_current)); 3780 coro_times_add (SvSTATE (coro_current));
… …
3816 3823
3817 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3824 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); 3825 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); 3826 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 */ 3827 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3821 3828
3822 coro_stash = gv_stashpv ("Coro", TRUE); 3829 coro_stash = gv_stashpv ("Coro", TRUE);
3823 3830
3824 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3825 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3832 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3826 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3833 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4048 on_leave = 1 4055 on_leave = 1
4049 PROTOTYPE: & 4056 PROTOTYPE: &
4050 CODE: 4057 CODE:
4051{ 4058{
4052 struct coro *coro = SvSTATE_current; 4059 struct coro *coro = SvSTATE_current;
4053 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4060 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4054 4061
4055 block = s_get_cv_croak (block); 4062 block = s_get_cv_croak (block);
4056 4063
4057 if (!*avp) 4064 if (!*avp)
4058 *avp = newAV (); 4065 *avp = newAV ();
… …
4078 4085
4079SV * 4086SV *
4080new (SV *klass, SV *count = 0) 4087new (SV *klass, SV *count = 0)
4081 CODE: 4088 CODE:
4082{ 4089{
4083 int semcnt = 1; 4090 int semcnt = 1;
4084 4091
4085 if (count) 4092 if (count)
4086 { 4093 {
4087 SvGETMAGIC (count); 4094 SvGETMAGIC (count);
4088 4095
… …
4148 XSRETURN_NO; 4155 XSRETURN_NO;
4149} 4156}
4150 4157
4151void 4158void
4152waiters (SV *self) 4159waiters (SV *self)
4153 PPCODE: 4160 PPCODE:
4154{ 4161{
4155 AV *av = (AV *)SvRV (self); 4162 AV *av = (AV *)SvRV (self);
4156 int wcount = AvFILLp (av) + 1 - 1; 4163 int wcount = AvFILLp (av) + 1 - 1;
4157 4164
4158 if (GIMME_V == G_SCALAR) 4165 if (GIMME_V == G_SCALAR)
… …
4170 4177
4171void 4178void
4172_may_delete (SV *sem, int count, unsigned int extra_refs) 4179_may_delete (SV *sem, int count, unsigned int extra_refs)
4173 PPCODE: 4180 PPCODE:
4174{ 4181{
4175 AV *av = (AV *)SvRV (sem); 4182 AV *av = (AV *)SvRV (sem);
4176 4183
4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4184 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4178 && AvFILLp (av) == 0 /* no waiters, just count */ 4185 && AvFILLp (av) == 0 /* no waiters, just count */
4179 && SvIV (AvARRAY (av)[0]) == count) 4186 && SvIV (AvARRAY (av)[0]) == count)
4180 XSRETURN_YES; 4187 XSRETURN_YES;
… …
4201 4208
4202void 4209void
4203broadcast (SV *self) 4210broadcast (SV *self)
4204 CODE: 4211 CODE:
4205{ 4212{
4206 AV *av = (AV *)SvRV (self); 4213 AV *av = (AV *)SvRV (self);
4207 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4214 coro_signal_wake (aTHX_ av, AvFILLp (av));
4208} 4215}
4209 4216
4210void 4217void
4211send (SV *self) 4218send (SV *self)
… …
4219 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4226 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4220} 4227}
4221 4228
4222IV 4229IV
4223awaited (SV *self) 4230awaited (SV *self)
4224 CODE: 4231 CODE:
4225 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4232 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4226 OUTPUT: 4233 OUTPUT:
4227 RETVAL 4234 RETVAL
4228 4235
4229 4236
… …
4234 4241
4235void 4242void
4236_schedule (...) 4243_schedule (...)
4237 CODE: 4244 CODE:
4238{ 4245{
4239 static int incede; 4246 static int incede;
4240 4247
4241 api_cede_notself (aTHX); 4248 api_cede_notself (aTHX);
4242 4249
4243 ++incede; 4250 ++incede;
4244 while (coro_nready >= incede && api_cede (aTHX)) 4251 while (coro_nready >= incede && api_cede (aTHX))
… …
4288 { 4295 {
4289 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4296 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4290 coro_old_pp_sselect = 0; 4297 coro_old_pp_sselect = 0;
4291 } 4298 }
4292 4299
4300MODULE = Coro::State PACKAGE = Coro::Util
4301
4302void
4303_exit (int code)
4304 CODE:
4305 _exit (code);
4306
4307NV
4308time ()
4309 CODE:
4310 RETVAL = nvtime (aTHX);
4311 OUTPUT:
4312 RETVAL
4313
4314NV
4315gettimeofday ()
4316 PPCODE:
4317{
4318 UV tv [2];
4319 u2time (aTHX_ tv);
4320 EXTEND (SP, 2);
4321 PUSHs (sv_2mortal (newSVuv (tv [0])));
4322 PUSHs (sv_2mortal (newSVuv (tv [1])));
4323}
4324

Diff Legend

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