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.449 by root, Sun Jun 21 17:02:49 2015 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#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
28#endif 58#endif
29 59
30#if defined(_WIN32) 60#if defined(_WIN32)
31# undef HAS_GETTIMEOFDAY 61# undef HAS_GETTIMEOFDAY
32# undef setjmp 62# undef setjmp
… …
35# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
36#else 66#else
37# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
38#endif 68#endif
39 69
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 */ 70/* the maximum number of idle cctx that will be pooled */
68static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
69 72
70#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
71# define HAS_SCOPESTACK_NAME 1 74# 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 75#endif
81 76
82/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
83#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
84# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
175typedef struct coro_cctx 170typedef struct coro_cctx
176{ 171{
177 struct coro_cctx *next; 172 struct coro_cctx *next;
178 173
179 /* the stack */ 174 /* the stack */
180 void *sptr; 175 struct coro_stack stack;
181 size_t ssize;
182 176
183 /* cpu state */ 177 /* cpu state */
184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG 179#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
295#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
296 290
297/** JIT *********************************************************************/ 291/** JIT *********************************************************************/
298 292
299#if CORO_JIT 293#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */ 294 /* APPLE doesn't have mmap though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE 296 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY 297 #if ECB_AMD64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix" 298 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY 299 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix" 300 #define CORO_JIT_TYPE "x86-unix"
307 #endif 301 #endif
308 #endif 302 #endif
309#endif 303#endif
310 304
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
312 #undef CORO_JIT 306 #undef CORO_JIT
313#endif 307#endif
314 308
315#if CORO_JIT 309#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *); 310 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
373time_init (pTHX) 367time_init (pTHX)
374{ 368{
375 SV **svp; 369 SV **svp;
376 370
377 require_pv ("Time/HiRes.pm"); 371 require_pv ("Time/HiRes.pm");
378 372
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380 374
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383 377
… …
524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
525 519
526/*****************************************************************************/ 520/*****************************************************************************/
527/* padlist management and caching */ 521/* padlist management and caching */
528 522
529ecb_inline AV * 523ecb_inline PADLIST *
530coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
531{ 525{
532 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
533 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
534 531
535 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
536 AvREAL_off (newpadlist); 560 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 561#endif
542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
543 --AvFILLp (padlist);
544 562
545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
546 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
547 571
548 return newpadlist; 572 return newpadlist;
549} 573}
550 574
551ecb_inline void 575ecb_inline void
552free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
553{ 577{
554 /* may be during global destruction */ 578 /* may be during global destruction */
555 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
556 { 580 {
557 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
558 582
559 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
560 { 584 {
561 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
562 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
563 I32 j = AvFILLp (av);
564 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
565 while (j >= 0) 592 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
567 594
568 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
569 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
570 } 598 }
571 599
572 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
573 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
574 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
575 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
576 } 610 }
577} 611}
578 612
579static int 613static int
580coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
581{ 615{
582 AV *padlist; 616 PADLIST *padlist;
583 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
584 619
585 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
587 return 0; 622 return 0;
588 623
589 /* casting is fun. */ 624 while (len--)
590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
591 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
592
593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
594 626
595 return 0; 627 return 0;
596} 628}
597 629
598static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
… …
603/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
604ecb_inline void 636ecb_inline void
605get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
606{ 638{
607 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
608 AV *av; 640 size_t *lenp;
609 641
610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
612 else 644 else
613 { 645 {
614#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
615 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
616 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
626 658
627ecb_inline void 659ecb_inline void
628put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
629{ 661{
630 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
631 AV *av;
632 663
633 if (ecb_expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
635 674
636 av = (AV *)mg->mg_obj; 675 ((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} 676}
643 677
644/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
645 679
646ecb_inline void 680ecb_inline void
… …
721 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
722 while (ecb_expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
723 { 757 {
724 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
725 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
726 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
727 } 761 }
728 762
729 PUTBACK; 763 PUTBACK;
730 } 764 }
731 765
… …
994 { 1028 {
995 SV **svp = 0; 1029 SV **svp = 0;
996 1030
997 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
998 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
999 1033
1000 if (svp) 1034 if (svp)
1001 { 1035 {
1002 SV *ssv; 1036 SV *ssv;
1003 1037
1004 if (!*svp) 1038 if (!*svp)
… …
1110 PL_hints = 0; 1144 PL_hints = 0;
1111 1145
1112 /* recreate the die/warn hooks */ 1146 /* recreate the die/warn hooks */
1113 PL_diehook = SvREFCNT_inc (rv_diehook); 1147 PL_diehook = SvREFCNT_inc (rv_diehook);
1114 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1148 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1115 1149
1116 GvSV (PL_defgv) = newSV (0); 1150 GvSV (PL_defgv) = newSV (0);
1117 GvAV (PL_defgv) = coro->args; coro->args = 0; 1151 GvAV (PL_defgv) = coro->args; coro->args = 0;
1118 GvSV (PL_errgv) = newSV (0); 1152 GvSV (PL_errgv) = newSV (0);
1119 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1153 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1120 GvHV (PL_hintgv) = 0; 1154 GvHV (PL_hintgv) = newHV ();
1155#if PERL_VERSION_ATLEAST (5,10,0)
1156 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1157#endif
1121 PL_rs = newSVsv (GvSV (irsgv)); 1158 PL_rs = newSVsv (GvSV (irsgv));
1122 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1159 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1123 1160
1124 { 1161 {
1125 dSP; 1162 dSP;
… …
1307 1344
1308 if (PL_curcop != &PL_compiling) 1345 if (PL_curcop != &PL_compiling)
1309 { 1346 {
1310 SV **cb; 1347 SV **cb;
1311 1348
1312 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1349 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1313 { 1350 {
1314 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1351 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1315 1352
1316 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1353 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1317 { 1354 {
… …
1489static coro_cctx * 1526static coro_cctx *
1490cctx_new_empty (void) 1527cctx_new_empty (void)
1491{ 1528{
1492 coro_cctx *cctx = cctx_new (); 1529 coro_cctx *cctx = cctx_new ();
1493 1530
1494 cctx->sptr = 0; 1531 cctx->stack.sptr = 0;
1495 coro_create (&cctx->cctx, 0, 0, 0, 0); 1532 coro_create (&cctx->cctx, 0, 0, 0, 0);
1496 1533
1497 return cctx; 1534 return cctx;
1498} 1535}
1499 1536
1500/* create a new cctx suitable as destination/running a perl interpreter */ 1537/* create a new cctx suitable as destination/running a perl interpreter */
1501static coro_cctx * 1538static coro_cctx *
1502cctx_new_run (void) 1539cctx_new_run (void)
1503{ 1540{
1504 coro_cctx *cctx = cctx_new (); 1541 coro_cctx *cctx = cctx_new ();
1505 void *stack_start;
1506 size_t stack_size;
1507 1542
1508#if HAVE_MMAP 1543 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 } 1544 {
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."); 1545 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1531 _exit (EXIT_FAILURE); 1546 _exit (EXIT_FAILURE);
1532 }
1533
1534 stack_start = cctx->sptr;
1535 stack_size = cctx->ssize;
1536 } 1547 }
1537 1548
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); 1549 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1543 1550
1544 return cctx; 1551 return cctx;
1545} 1552}
1546 1553
1547static void 1554static void
… …
1553 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1560 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1554 1561
1555 --cctx_count; 1562 --cctx_count;
1556 coro_destroy (&cctx->cctx); 1563 coro_destroy (&cctx->cctx);
1557 1564
1558 /* coro_transfer creates new, empty cctx's */ 1565 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 1566
1573 Safefree (cctx); 1567 Safefree (cctx);
1574} 1568}
1575 1569
1576/* wether this cctx should be destructed */ 1570/* wether this cctx should be destructed */
… …
1595} 1589}
1596 1590
1597static void 1591static void
1598cctx_put (coro_cctx *cctx) 1592cctx_put (coro_cctx *cctx)
1599{ 1593{
1600 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1594 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1601 1595
1602 /* free another cctx if overlimit */ 1596 /* free another cctx if overlimit */
1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1597 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1604 { 1598 {
1605 coro_cctx *first = cctx_first; 1599 coro_cctx *first = cctx_first;
… …
1731 return; 1725 return;
1732 1726
1733 slf_destroy (aTHX_ coro); 1727 slf_destroy (aTHX_ coro);
1734 1728
1735 coro->flags |= CF_ZOMBIE; 1729 coro->flags |= CF_ZOMBIE;
1736 1730
1737 if (coro->flags & CF_READY) 1731 if (coro->flags & CF_READY)
1738 { 1732 {
1739 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1733 /* reduce nready, as destroying a ready coro effectively unreadies it */
1740 /* alternative: look through all ready queues and remove the coro */ 1734 /* alternative: look through all ready queues and remove the coro */
1741 --coro_nready; 1735 --coro_nready;
… …
1937 /* nothing to schedule: call the idle handler */ 1931 /* nothing to schedule: call the idle handler */
1938 if (SvROK (sv_idle) 1932 if (SvROK (sv_idle)
1939 && SvOBJECT (SvRV (sv_idle))) 1933 && SvOBJECT (SvRV (sv_idle)))
1940 { 1934 {
1941 if (SvRV (sv_idle) == SvRV (coro_current)) 1935 if (SvRV (sv_idle) == SvRV (coro_current))
1936 {
1937 require_pv ("Carp");
1938
1939 {
1940 dSP;
1941
1942 ENTER;
1943 SAVETMPS;
1944
1945 PUSHMARK (SP);
1942 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1946 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1947 PUTBACK;
1948 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1949
1950 FREETMPS;
1951 LEAVE;
1952 }
1953 }
1943 1954
1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1955 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1945 api_ready (aTHX_ SvRV (sv_idle)); 1956 api_ready (aTHX_ SvRV (sv_idle));
1946 --coro_nready; 1957 --coro_nready;
1947 } 1958 }
… …
2145 AV *od = coro->on_destroy; 2156 AV *od = coro->on_destroy;
2146 2157
2147 if (!od) 2158 if (!od)
2148 return; 2159 return;
2149 2160
2161 coro->on_destroy = 0;
2162 sv_2mortal ((SV *)od);
2163
2150 while (AvFILLp (od) >= 0) 2164 while (AvFILLp (od) >= 0)
2151 { 2165 {
2152 SV *cb = sv_2mortal (av_pop (od)); 2166 SV *cb = sv_2mortal (av_pop (od));
2153 2167
2154 /* coro hv's (and only hv's at the moment) are supported as well */ 2168 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2174 2188
2175static void 2189static void
2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2190coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2177{ 2191{
2178 AV *av; 2192 AV *av;
2179 2193
2180 if (coro->status) 2194 if (coro->status)
2181 { 2195 {
2182 av = coro->status; 2196 av = coro->status;
2183 av_clear (av); 2197 av_clear (av);
2184 } 2198 }
… …
2231 2245
2232 coro = SvSTATE (arg [0]); 2246 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv; 2247 coro_hv = coro->hv;
2234 2248
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2249 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236 2250
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2251 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 { 2252 {
2239 /* coro currently busy cancelling something, so just notify it */ 2253 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro; 2254 coro->slf_frame.data = (void *)coro;
2241 2255
… …
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2262 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 } 2263 }
2250 else 2264 else
2251 { 2265 {
2252 struct coro *self = SvSTATE_current; 2266 struct coro *self = SvSTATE_current;
2267
2268 if (!self)
2269 croak ("Coro::cancel called outside of thread content,");
2253 2270
2254 /* otherwise we cancel directly, purely for speed reasons 2271 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as 2272 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation. 2273 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed. 2274 * this is ugly, and hopefully fully worth the extra speed.
… …
2420 2437
2421static int 2438static int
2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2439slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2423{ 2440{
2424 SV *data = (SV *)frame->data; 2441 SV *data = (SV *)frame->data;
2425 2442
2426 if (CORO_THROW) 2443 if (CORO_THROW)
2427 return 0; 2444 return 0;
2428 2445
2429 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2446 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2430 return 1; 2447 return 1;
… …
2466 cb = sv_2mortal (coro->rouse_cb); 2483 cb = sv_2mortal (coro->rouse_cb);
2467 coro->rouse_cb = 0; 2484 coro->rouse_cb = 0;
2468 } 2485 }
2469 2486
2470 if (!SvROK (cb) 2487 if (!SvROK (cb)
2471 || SvTYPE (SvRV (cb)) != SVt_PVCV 2488 || SvTYPE (SvRV (cb)) != SVt_PVCV
2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2489 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2473 croak ("Coro::rouse_wait called with illegal callback argument,"); 2490 croak ("Coro::rouse_wait called with illegal callback argument,");
2474 2491
2475 { 2492 {
2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2599 2616
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2617/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void 2618static void
2602slf_destroy (pTHX_ struct coro *coro) 2619slf_destroy (pTHX_ struct coro *coro)
2603{ 2620{
2604 /* this callback is reserved for slf functions needing to do cleanup */ 2621 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 2622
2608 /* 2623 /*
2609 * The on_destroy above most likely is from an SLF call. 2624 * The on_destroy below most likely is from an SLF call.
2610 * Since by definition the SLF call will not finish when we destroy 2625 * Since by definition the SLF call will not finish when we destroy
2611 * the coro, we will have to force-finish it here, otherwise 2626 * the coro, we will have to force-finish it here, otherwise
2612 * cleanup functions cannot call SLF functions. 2627 * cleanup functions cannot call SLF functions.
2613 */ 2628 */
2614 coro->slf_frame.prepare = 0; 2629 coro->slf_frame.prepare = 0;
2630
2631 /* this callback is reserved for slf functions needing to do cleanup */
2632 if (frame.destroy && frame.prepare && !PL_dirty)
2633 frame.destroy (aTHX_ &frame);
2615} 2634}
2616 2635
2617/* 2636/*
2618 * these not obviously related functions are all rolled into one 2637 * these not obviously related functions are all rolled into one
2619 * function to increase chances that they all will call transfer with the same 2638 * function to increase chances that they all will call transfer with the same
… …
2959{ 2978{
2960 AV *av = (AV *)frame->data; 2979 AV *av = (AV *)frame->data;
2961 SV *count_sv = AvARRAY (av)[0]; 2980 SV *count_sv = AvARRAY (av)[0];
2962 SV *coro_hv = SvRV (coro_current); 2981 SV *coro_hv = SvRV (coro_current);
2963 2982
2983 frame->destroy = 0;
2984
2964 /* if we are about to throw, don't actually acquire the lock, just throw */ 2985 /* if we are about to throw, don't actually acquire the lock, just throw */
2965 if (CORO_THROW) 2986 if (ecb_expect_false (CORO_THROW))
2987 {
2988 /* we still might be responsible for the semaphore, so wake up others */
2989 coro_semaphore_adjust (aTHX_ av, 0);
2990
2966 return 0; 2991 return 0;
2992 }
2967 else if (SvIVX (count_sv) > 0) 2993 else if (SvIVX (count_sv) > 0)
2968 { 2994 {
2969 frame->destroy = 0;
2970
2971 if (acquire) 2995 if (acquire)
2972 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2996 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2973 else 2997 else
2974 coro_semaphore_adjust (aTHX_ av, 0); 2998 coro_semaphore_adjust (aTHX_ av, 0);
2975 2999
… …
3197 /* it quickly returns */ 3221 /* it quickly returns */
3198 if (CORO_THROW) 3222 if (CORO_THROW)
3199 return 0; 3223 return 0;
3200 3224
3201 /* one element that is an RV? repeat! */ 3225 /* one element that is an RV? repeat! */
3202 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3226 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3203 return 1; 3227 return 1;
3204 3228
3205 /* restore status */ 3229 /* restore status */
3206 { 3230 {
3207 SV *data_sv = av_pop (state); 3231 SV *data_sv = av_pop (state);
… …
3435 3459
3436PROTOTYPES: DISABLE 3460PROTOTYPES: DISABLE
3437 3461
3438BOOT: 3462BOOT:
3439{ 3463{
3464#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3465#include "state.h"
3440#ifdef USE_ITHREADS 3466#ifdef USE_ITHREADS
3441# if CORO_PTHREAD 3467# if CORO_PTHREAD
3442 coro_thx = PERL_GET_CONTEXT; 3468 coro_thx = PERL_GET_CONTEXT;
3443# endif 3469# endif
3444#endif 3470#endif
3445 BOOT_PAGESIZE;
3446
3447 /* perl defines these to check for existance first, but why it doesn't */ 3471 /* 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 */ 3472 /* just create them one at init time is not clear to me, except for */
3449 /* programs trying to delete them, but... */ 3473 /* programs trying to delete them, but... */
3450 /* anyway, we declare this as invalid and make sure they are initialised here */ 3474 /* anyway, we declare this as invalid and make sure they are initialised here */
3451 DEFSV; 3475 DEFSV;
… …
3521void 3545void
3522transfer (...) 3546transfer (...)
3523 PROTOTYPE: $$ 3547 PROTOTYPE: $$
3524 CODE: 3548 CODE:
3525 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3549 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3526
3527void
3528_exit (int code)
3529 PROTOTYPE: $
3530 CODE:
3531 _exit (code);
3532 3550
3533SV * 3551SV *
3534clone (Coro::State coro) 3552clone (Coro::State coro)
3535 CODE: 3553 CODE:
3536{ 3554{
… …
3591void 3609void
3592list () 3610list ()
3593 PROTOTYPE: 3611 PROTOTYPE:
3594 PPCODE: 3612 PPCODE:
3595{ 3613{
3596 struct coro *coro; 3614 struct coro *coro;
3597 for (coro = coro_first; coro; coro = coro->next) 3615 for (coro = coro_first; coro; coro = coro->next)
3598 if (coro->hv) 3616 if (coro->hv)
3599 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3617 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3600} 3618}
3601 3619
… …
3763 3781
3764void 3782void
3765times (Coro::State self) 3783times (Coro::State self)
3766 PPCODE: 3784 PPCODE:
3767{ 3785{
3768 struct coro *current = SvSTATE (coro_current); 3786 struct coro *current = SvSTATE (coro_current);
3769 3787
3770 if (ecb_expect_false (current == self)) 3788 if (ecb_expect_false (current == self))
3771 { 3789 {
3772 coro_times_update (); 3790 coro_times_update ();
3773 coro_times_add (SvSTATE (coro_current)); 3791 coro_times_add (SvSTATE (coro_current));
… …
3816 3834
3817 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3835 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); 3836 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); 3837 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 */ 3838 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3821 3839
3822 coro_stash = gv_stashpv ("Coro", TRUE); 3840 coro_stash = gv_stashpv ("Coro", TRUE);
3823 3841
3824 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3825 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3826 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4048 on_leave = 1 4066 on_leave = 1
4049 PROTOTYPE: & 4067 PROTOTYPE: &
4050 CODE: 4068 CODE:
4051{ 4069{
4052 struct coro *coro = SvSTATE_current; 4070 struct coro *coro = SvSTATE_current;
4053 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4071 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4054 4072
4055 block = s_get_cv_croak (block); 4073 block = s_get_cv_croak (block);
4056 4074
4057 if (!*avp) 4075 if (!*avp)
4058 *avp = newAV (); 4076 *avp = newAV ();
… …
4078 4096
4079SV * 4097SV *
4080new (SV *klass, SV *count = 0) 4098new (SV *klass, SV *count = 0)
4081 CODE: 4099 CODE:
4082{ 4100{
4083 int semcnt = 1; 4101 int semcnt = 1;
4084 4102
4085 if (count) 4103 if (count)
4086 { 4104 {
4087 SvGETMAGIC (count); 4105 SvGETMAGIC (count);
4088 4106
… …
4148 XSRETURN_NO; 4166 XSRETURN_NO;
4149} 4167}
4150 4168
4151void 4169void
4152waiters (SV *self) 4170waiters (SV *self)
4153 PPCODE: 4171 PPCODE:
4154{ 4172{
4155 AV *av = (AV *)SvRV (self); 4173 AV *av = (AV *)SvRV (self);
4156 int wcount = AvFILLp (av) + 1 - 1; 4174 int wcount = AvFILLp (av) + 1 - 1;
4157 4175
4158 if (GIMME_V == G_SCALAR) 4176 if (GIMME_V == G_SCALAR)
… …
4170 4188
4171void 4189void
4172_may_delete (SV *sem, int count, unsigned int extra_refs) 4190_may_delete (SV *sem, int count, unsigned int extra_refs)
4173 PPCODE: 4191 PPCODE:
4174{ 4192{
4175 AV *av = (AV *)SvRV (sem); 4193 AV *av = (AV *)SvRV (sem);
4176 4194
4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4195 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4178 && AvFILLp (av) == 0 /* no waiters, just count */ 4196 && AvFILLp (av) == 0 /* no waiters, just count */
4179 && SvIV (AvARRAY (av)[0]) == count) 4197 && SvIV (AvARRAY (av)[0]) == count)
4180 XSRETURN_YES; 4198 XSRETURN_YES;
… …
4201 4219
4202void 4220void
4203broadcast (SV *self) 4221broadcast (SV *self)
4204 CODE: 4222 CODE:
4205{ 4223{
4206 AV *av = (AV *)SvRV (self); 4224 AV *av = (AV *)SvRV (self);
4207 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4225 coro_signal_wake (aTHX_ av, AvFILLp (av));
4208} 4226}
4209 4227
4210void 4228void
4211send (SV *self) 4229send (SV *self)
… …
4219 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4237 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4220} 4238}
4221 4239
4222IV 4240IV
4223awaited (SV *self) 4241awaited (SV *self)
4224 CODE: 4242 CODE:
4225 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4243 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4226 OUTPUT: 4244 OUTPUT:
4227 RETVAL 4245 RETVAL
4228 4246
4229 4247
… …
4234 4252
4235void 4253void
4236_schedule (...) 4254_schedule (...)
4237 CODE: 4255 CODE:
4238{ 4256{
4239 static int incede; 4257 static int incede;
4240 4258
4241 api_cede_notself (aTHX); 4259 api_cede_notself (aTHX);
4242 4260
4243 ++incede; 4261 ++incede;
4244 while (coro_nready >= incede && api_cede (aTHX)) 4262 while (coro_nready >= incede && api_cede (aTHX))
… …
4288 { 4306 {
4289 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4307 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4290 coro_old_pp_sselect = 0; 4308 coro_old_pp_sselect = 0;
4291 } 4309 }
4292 4310
4311MODULE = Coro::State PACKAGE = Coro::Util
4312
4313void
4314_exit (int code)
4315 CODE:
4316 _exit (code);
4317
4318NV
4319time ()
4320 CODE:
4321 RETVAL = nvtime (aTHX);
4322 OUTPUT:
4323 RETVAL
4324
4325NV
4326gettimeofday ()
4327 PPCODE:
4328{
4329 UV tv [2];
4330 u2time (aTHX_ tv);
4331 EXTEND (SP, 2);
4332 PUSHs (sv_2mortal (newSVuv (tv [0])));
4333 PUSHs (sv_2mortal (newSVuv (tv [1])));
4334}
4335

Diff Legend

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