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.419 by root, Mon Feb 20 08:13:25 2012 UTC vs.
Revision 1.438 by root, Mon Nov 18 10:27:53 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))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
26#endif 51#endif
27 52
28#if defined(_WIN32) 53#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 54# undef HAS_GETTIMEOFDAY
30# undef setjmp 55# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
34#else 59#else
35# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
36#endif 61#endif
37 62
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 */ 63/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
67 65
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 67# 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 68#endif
79 69
80/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
173typedef struct coro_cctx 163typedef struct coro_cctx
174{ 164{
175 struct coro_cctx *next; 165 struct coro_cctx *next;
176 166
177 /* the stack */ 167 /* the stack */
178 void *sptr; 168 struct coro_stack stack;
179 size_t ssize;
180 169
181 /* cpu state */ 170 /* cpu state */
182 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
183#ifndef NDEBUG 172#ifndef NDEBUG
184 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
293#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
294 283
295/** JIT *********************************************************************/ 284/** JIT *********************************************************************/
296 285
297#if CORO_JIT 286#if CORO_JIT
298 /* APPLE doesn't have HAVE_MMAP though */ 287 /* APPLE doesn't have mmap though */
299 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
300 #ifndef CORO_JIT_TYPE 289 #ifndef CORO_JIT_TYPE
301 #if __x86_64 && CORO_JIT_UNIXY 290 #if ECB_AMD64 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "amd64-unix" 291 #define CORO_JIT_TYPE "amd64-unix"
303 #elif __i386 && CORO_JIT_UNIXY 292 #elif __i386 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "x86-unix" 293 #define CORO_JIT_TYPE "x86-unix"
305 #endif 294 #endif
306 #endif 295 #endif
307#endif 296#endif
308 297
309#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
310 #undef CORO_JIT 299 #undef CORO_JIT
311#endif 300#endif
312 301
313#if CORO_JIT 302#if CORO_JIT
314 typedef void (*load_save_perl_slots_type)(perl_slots *); 303 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
371time_init (pTHX) 360time_init (pTHX)
372{ 361{
373 SV **svp; 362 SV **svp;
374 363
375 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
376 365
377 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
378 367
379 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
380 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
381 370
… …
522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
523 512
524/*****************************************************************************/ 513/*****************************************************************************/
525/* padlist management and caching */ 514/* padlist management and caching */
526 515
527ecb_inline AV * 516ecb_inline PADLIST *
528coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
529{ 518{
530 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
531 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
532 523
533 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
534 AvREAL_off (newpadlist); 552 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 553#endif
540 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
541 --AvFILLp (padlist);
542 554
543 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
544 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
545 559
546 return newpadlist; 560 return newpadlist;
547} 561}
548 562
549ecb_inline void 563ecb_inline void
550free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
551{ 565{
552 /* may be during global destruction */ 566 /* may be during global destruction */
553 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
554 { 568 {
555 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
556 570
557 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
558 { 572 {
559 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
560 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
561 I32 j = AvFILLp (av);
562 575
576 if (pad)
577 {
578 I32 j = PadMAX (pad);
579
563 while (j >= 0) 580 while (j >= 0)
564 SvREFCNT_dec (AvARRAY (av)[j--]); 581 SvREFCNT_dec (PadARRAY (pad)[j--]);
565 582
566 AvFILLp (av) = -1; 583 PadMAX (pad) = -1;
567 SvREFCNT_dec (av); 584 SvREFCNT_dec (pad);
585 }
568 } 586 }
569 587
570 SvREFCNT_dec (AvARRAY (padlist)[0]); 588 SvREFCNT_dec (PadlistNAMES (padlist));
571 589
590#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist);
593#else
572 AvFILLp (padlist) = -1; 594 AvFILLp (padlist) = -1;
595 AvREAL_off (padlist);
573 SvREFCNT_dec ((SV*)padlist); 596 SvREFCNT_dec ((SV*)padlist);
597#endif
574 } 598 }
575} 599}
576 600
577static int 601static int
578coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 602coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
579{ 603{
580 AV *padlist; 604 PADLIST *padlist;
581 AV *av = (AV *)mg->mg_obj; 605 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
606 size_t len = *(size_t *)mg->mg_ptr;
582 607
583 /* perl manages to free our internal AV and _then_ call us */ 608 /* perl manages to free our internal AV and _then_ call us */
584 if (IN_DESTRUCT) 609 if (IN_DESTRUCT)
585 return 0; 610 return 0;
586 611
587 /* casting is fun. */ 612 while (len--)
588 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
589 free_padlist (aTHX_ padlist); 613 free_padlist (aTHX_ padlists[len]);
590
591 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
592 614
593 return 0; 615 return 0;
594} 616}
595 617
596static MGVTBL coro_cv_vtbl = { 618static MGVTBL coro_cv_vtbl = {
… …
601/* the next two functions merely cache the padlists */ 623/* the next two functions merely cache the padlists */
602ecb_inline void 624ecb_inline void
603get_padlist (pTHX_ CV *cv) 625get_padlist (pTHX_ CV *cv)
604{ 626{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 627 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 628 size_t *lenp;
607 629
608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 630 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 631 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
610 else 632 else
611 { 633 {
612#if CORO_PREFER_PERL_FUNCTIONS 634#if CORO_PREFER_PERL_FUNCTIONS
613 /* this is probably cleaner? but also slower! */ 635 /* this is probably cleaner? but also slower! */
614 /* in practise, it seems to be less stable */ 636 /* in practise, it seems to be less stable */
… …
624 646
625ecb_inline void 647ecb_inline void
626put_padlist (pTHX_ CV *cv) 648put_padlist (pTHX_ CV *cv)
627{ 649{
628 MAGIC *mg = CORO_MAGIC_cv (cv); 650 MAGIC *mg = CORO_MAGIC_cv (cv);
629 AV *av;
630 651
631 if (ecb_expect_false (!mg)) 652 if (ecb_expect_false (!mg))
653 {
632 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 654 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
655 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
656 mg->mg_len = 1; /* so mg_free frees mg_ptr */
657 }
658 else
659 Renew (mg->mg_ptr,
660 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
661 char);
633 662
634 av = (AV *)mg->mg_obj; 663 ((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} 664}
641 665
642/** load & save, init *******************************************************/ 666/** load & save, init *******************************************************/
643 667
644ecb_inline void 668ecb_inline void
… …
719 /* now do the ugly restore mess */ 743 /* now do the ugly restore mess */
720 while (ecb_expect_true (cv = (CV *)POPs)) 744 while (ecb_expect_true (cv = (CV *)POPs))
721 { 745 {
722 put_padlist (aTHX_ cv); /* mark this padlist as available */ 746 put_padlist (aTHX_ cv); /* mark this padlist as available */
723 CvDEPTH (cv) = PTR2IV (POPs); 747 CvDEPTH (cv) = PTR2IV (POPs);
724 CvPADLIST (cv) = (AV *)POPs; 748 CvPADLIST (cv) = (PADLIST *)POPs;
725 } 749 }
726 750
727 PUTBACK; 751 PUTBACK;
728 } 752 }
729 753
… …
992 { 1016 {
993 SV **svp = 0; 1017 SV **svp = 0;
994 1018
995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
997 1021
998 if (svp) 1022 if (svp)
999 { 1023 {
1000 SV *ssv; 1024 SV *ssv;
1001 1025
1002 if (!*svp) 1026 if (!*svp)
… …
1108 PL_hints = 0; 1132 PL_hints = 0;
1109 1133
1110 /* recreate the die/warn hooks */ 1134 /* recreate the die/warn hooks */
1111 PL_diehook = SvREFCNT_inc (rv_diehook); 1135 PL_diehook = SvREFCNT_inc (rv_diehook);
1112 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1136 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1113 1137
1114 GvSV (PL_defgv) = newSV (0); 1138 GvSV (PL_defgv) = newSV (0);
1115 GvAV (PL_defgv) = coro->args; coro->args = 0; 1139 GvAV (PL_defgv) = coro->args; coro->args = 0;
1116 GvSV (PL_errgv) = newSV (0); 1140 GvSV (PL_errgv) = newSV (0);
1117 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1118 GvHV (PL_hintgv) = 0; 1142 GvHV (PL_hintgv) = 0;
… …
1416/* try to exit the same way perl's main function would do */ 1440/* try to exit the same way perl's main function would do */
1417/* we do not bother resetting the environment or other things *7 1441/* we do not bother resetting the environment or other things *7
1418/* that are not, uhm, essential */ 1442/* that are not, uhm, essential */
1419/* this obviously also doesn't work when perl is embedded */ 1443/* this obviously also doesn't work when perl is embedded */
1420static void ecb_noinline ecb_cold 1444static void ecb_noinline ecb_cold
1421perlish_exit (void) 1445perlish_exit (pTHX)
1422{ 1446{
1423 int exitstatus = perl_destruct (PL_curinterp); 1447 int exitstatus = perl_destruct (PL_curinterp);
1424 perl_free (PL_curinterp); 1448 perl_free (PL_curinterp);
1425 exit (exitstatus); 1449 exit (exitstatus);
1426} 1450}
… …
1462 * If perl-run returns we assume exit() was being called or the coro 1486 * If perl-run returns we assume exit() was being called or the coro
1463 * fell off the end, which seems to be the only valid (non-bug) 1487 * fell off the end, which seems to be the only valid (non-bug)
1464 * reason for perl_run to return. We try to mimic whatever perl is normally 1488 * reason for perl_run to return. We try to mimic whatever perl is normally
1465 * doing in that case. YMMV. 1489 * doing in that case. YMMV.
1466 */ 1490 */
1467 perlish_exit (); 1491 perlish_exit (aTHX);
1468 } 1492 }
1469} 1493}
1470 1494
1471static coro_cctx * 1495static coro_cctx *
1472cctx_new (void) 1496cctx_new (void)
… …
1487static coro_cctx * 1511static coro_cctx *
1488cctx_new_empty (void) 1512cctx_new_empty (void)
1489{ 1513{
1490 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1491 1515
1492 cctx->sptr = 0; 1516 cctx->stack.sptr = 0;
1493 coro_create (&cctx->cctx, 0, 0, 0, 0); 1517 coro_create (&cctx->cctx, 0, 0, 0, 0);
1494 1518
1495 return cctx; 1519 return cctx;
1496} 1520}
1497 1521
1498/* create a new cctx suitable as destination/running a perl interpreter */ 1522/* create a new cctx suitable as destination/running a perl interpreter */
1499static coro_cctx * 1523static coro_cctx *
1500cctx_new_run (void) 1524cctx_new_run (void)
1501{ 1525{
1502 coro_cctx *cctx = cctx_new (); 1526 coro_cctx *cctx = cctx_new ();
1503 void *stack_start;
1504 size_t stack_size;
1505 1527
1506#if HAVE_MMAP 1528 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, 0, 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 } 1529 {
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."); 1530 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1529 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1530 }
1531
1532 stack_start = cctx->sptr;
1533 stack_size = cctx->ssize;
1534 } 1532 }
1535 1533
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); 1534 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1541 1535
1542 return cctx; 1536 return cctx;
1543} 1537}
1544 1538
1545static void 1539static void
… …
1551 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1545 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1552 1546
1553 --cctx_count; 1547 --cctx_count;
1554 coro_destroy (&cctx->cctx); 1548 coro_destroy (&cctx->cctx);
1555 1549
1556 /* coro_transfer creates new, empty cctx's */ 1550 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 1551
1571 Safefree (cctx); 1552 Safefree (cctx);
1572} 1553}
1573 1554
1574/* wether this cctx should be destructed */ 1555/* wether this cctx should be destructed */
… …
1593} 1574}
1594 1575
1595static void 1576static void
1596cctx_put (coro_cctx *cctx) 1577cctx_put (coro_cctx *cctx)
1597{ 1578{
1598 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1579 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1599 1580
1600 /* free another cctx if overlimit */ 1581 /* free another cctx if overlimit */
1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1582 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1602 { 1583 {
1603 coro_cctx *first = cctx_first; 1584 coro_cctx *first = cctx_first;
… …
1729 return; 1710 return;
1730 1711
1731 slf_destroy (aTHX_ coro); 1712 slf_destroy (aTHX_ coro);
1732 1713
1733 coro->flags |= CF_ZOMBIE; 1714 coro->flags |= CF_ZOMBIE;
1734 1715
1735 if (coro->flags & CF_READY) 1716 if (coro->flags & CF_READY)
1736 { 1717 {
1737 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1718 /* reduce nready, as destroying a ready coro effectively unreadies it */
1738 /* alternative: look through all ready queues and remove the coro */ 1719 /* alternative: look through all ready queues and remove the coro */
1739 --coro_nready; 1720 --coro_nready;
… …
2143 AV *od = coro->on_destroy; 2124 AV *od = coro->on_destroy;
2144 2125
2145 if (!od) 2126 if (!od)
2146 return; 2127 return;
2147 2128
2129 coro->on_destroy = 0;
2130 sv_2mortal ((SV *)od);
2131
2148 while (AvFILLp (od) >= 0) 2132 while (AvFILLp (od) >= 0)
2149 { 2133 {
2150 SV *cb = sv_2mortal (av_pop (od)); 2134 SV *cb = sv_2mortal (av_pop (od));
2151 2135
2152 /* coro hv's (and only hv's at the moment) are supported as well */ 2136 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2172 2156
2173static void 2157static void
2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2158coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2175{ 2159{
2176 AV *av; 2160 AV *av;
2177 2161
2178 if (coro->status) 2162 if (coro->status)
2179 { 2163 {
2180 av = coro->status; 2164 av = coro->status;
2181 av_clear (av); 2165 av_clear (av);
2182 } 2166 }
… …
2229 2213
2230 coro = SvSTATE (arg [0]); 2214 coro = SvSTATE (arg [0]);
2231 coro_hv = coro->hv; 2215 coro_hv = coro->hv;
2232 2216
2233 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2217 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2234 2218
2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2219 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2236 { 2220 {
2237 /* coro currently busy cancelling something, so just notify it */ 2221 /* coro currently busy cancelling something, so just notify it */
2238 coro->slf_frame.data = (void *)coro; 2222 coro->slf_frame.data = (void *)coro;
2239 2223
… …
2418 2402
2419static int 2403static int
2420slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2404slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2421{ 2405{
2422 SV *data = (SV *)frame->data; 2406 SV *data = (SV *)frame->data;
2423 2407
2424 if (CORO_THROW) 2408 if (CORO_THROW)
2425 return 0; 2409 return 0;
2426 2410
2427 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2411 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2428 return 1; 2412 return 1;
… …
2464 cb = sv_2mortal (coro->rouse_cb); 2448 cb = sv_2mortal (coro->rouse_cb);
2465 coro->rouse_cb = 0; 2449 coro->rouse_cb = 0;
2466 } 2450 }
2467 2451
2468 if (!SvROK (cb) 2452 if (!SvROK (cb)
2469 || SvTYPE (SvRV (cb)) != SVt_PVCV 2453 || SvTYPE (SvRV (cb)) != SVt_PVCV
2470 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2454 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2471 croak ("Coro::rouse_wait called with illegal callback argument,"); 2455 croak ("Coro::rouse_wait called with illegal callback argument,");
2472 2456
2473 { 2457 {
2474 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2458 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3195 /* it quickly returns */ 3179 /* it quickly returns */
3196 if (CORO_THROW) 3180 if (CORO_THROW)
3197 return 0; 3181 return 0;
3198 3182
3199 /* one element that is an RV? repeat! */ 3183 /* one element that is an RV? repeat! */
3200 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3184 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3201 return 1; 3185 return 1;
3202 3186
3203 /* restore status */ 3187 /* restore status */
3204 { 3188 {
3205 SV *data_sv = av_pop (state); 3189 SV *data_sv = av_pop (state);
… …
3438#ifdef USE_ITHREADS 3422#ifdef USE_ITHREADS
3439# if CORO_PTHREAD 3423# if CORO_PTHREAD
3440 coro_thx = PERL_GET_CONTEXT; 3424 coro_thx = PERL_GET_CONTEXT;
3441# endif 3425# endif
3442#endif 3426#endif
3443 BOOT_PAGESIZE;
3444
3445 /* perl defines these to check for existance first, but why it doesn't */ 3427 /* 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 */ 3428 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */ 3429 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */ 3430 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV; 3431 DEFSV;
… …
3519void 3501void
3520transfer (...) 3502transfer (...)
3521 PROTOTYPE: $$ 3503 PROTOTYPE: $$
3522 CODE: 3504 CODE:
3523 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3505 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3524
3525void
3526_exit (int code)
3527 PROTOTYPE: $
3528 CODE:
3529 _exit (code);
3530 3506
3531SV * 3507SV *
3532clone (Coro::State coro) 3508clone (Coro::State coro)
3533 CODE: 3509 CODE:
3534{ 3510{
… …
3589void 3565void
3590list () 3566list ()
3591 PROTOTYPE: 3567 PROTOTYPE:
3592 PPCODE: 3568 PPCODE:
3593{ 3569{
3594 struct coro *coro; 3570 struct coro *coro;
3595 for (coro = coro_first; coro; coro = coro->next) 3571 for (coro = coro_first; coro; coro = coro->next)
3596 if (coro->hv) 3572 if (coro->hv)
3597 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3573 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3598} 3574}
3599 3575
… …
3663 RETVAL = boolSV (coro->flags & ix); 3639 RETVAL = boolSV (coro->flags & ix);
3664 OUTPUT: 3640 OUTPUT:
3665 RETVAL 3641 RETVAL
3666 3642
3667void 3643void
3668throw (Coro::State self, SV *exception = &PL_sv_undef) 3644throw (SV *self, SV *exception = &PL_sv_undef)
3669 PROTOTYPE: $;$ 3645 PROTOTYPE: $;$
3670 CODE: 3646 CODE:
3671{ 3647{
3648 struct coro *coro = SvSTATE (self);
3672 struct coro *current = SvSTATE_current; 3649 struct coro *current = SvSTATE_current;
3673 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3650 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3674 SvREFCNT_dec (*exceptionp); 3651 SvREFCNT_dec (*exceptionp);
3675 SvGETMAGIC (exception); 3652 SvGETMAGIC (exception);
3676 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3653 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3654
3655 api_ready (aTHX_ self);
3677} 3656}
3678 3657
3679void 3658void
3680api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3659api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3681 PROTOTYPE: $;$ 3660 PROTOTYPE: $;$
… …
3758 3737
3759void 3738void
3760times (Coro::State self) 3739times (Coro::State self)
3761 PPCODE: 3740 PPCODE:
3762{ 3741{
3763 struct coro *current = SvSTATE (coro_current); 3742 struct coro *current = SvSTATE (coro_current);
3764 3743
3765 if (ecb_expect_false (current == self)) 3744 if (ecb_expect_false (current == self))
3766 { 3745 {
3767 coro_times_update (); 3746 coro_times_update ();
3768 coro_times_add (SvSTATE (coro_current)); 3747 coro_times_add (SvSTATE (coro_current));
… …
3811 3790
3812 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3791 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3813 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3792 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3814 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3793 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3815 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3794 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3816 3795
3817 coro_stash = gv_stashpv ("Coro", TRUE); 3796 coro_stash = gv_stashpv ("Coro", TRUE);
3818 3797
3819 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3798 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3820 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3799 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3821 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3800 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4043 on_leave = 1 4022 on_leave = 1
4044 PROTOTYPE: & 4023 PROTOTYPE: &
4045 CODE: 4024 CODE:
4046{ 4025{
4047 struct coro *coro = SvSTATE_current; 4026 struct coro *coro = SvSTATE_current;
4048 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4027 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4049 4028
4050 block = s_get_cv_croak (block); 4029 block = s_get_cv_croak (block);
4051 4030
4052 if (!*avp) 4031 if (!*avp)
4053 *avp = newAV (); 4032 *avp = newAV ();
… …
4073 4052
4074SV * 4053SV *
4075new (SV *klass, SV *count = 0) 4054new (SV *klass, SV *count = 0)
4076 CODE: 4055 CODE:
4077{ 4056{
4078 int semcnt = 1; 4057 int semcnt = 1;
4079 4058
4080 if (count) 4059 if (count)
4081 { 4060 {
4082 SvGETMAGIC (count); 4061 SvGETMAGIC (count);
4083 4062
… …
4143 XSRETURN_NO; 4122 XSRETURN_NO;
4144} 4123}
4145 4124
4146void 4125void
4147waiters (SV *self) 4126waiters (SV *self)
4148 PPCODE: 4127 PPCODE:
4149{ 4128{
4150 AV *av = (AV *)SvRV (self); 4129 AV *av = (AV *)SvRV (self);
4151 int wcount = AvFILLp (av) + 1 - 1; 4130 int wcount = AvFILLp (av) + 1 - 1;
4152 4131
4153 if (GIMME_V == G_SCALAR) 4132 if (GIMME_V == G_SCALAR)
… …
4165 4144
4166void 4145void
4167_may_delete (SV *sem, int count, unsigned int extra_refs) 4146_may_delete (SV *sem, int count, unsigned int extra_refs)
4168 PPCODE: 4147 PPCODE:
4169{ 4148{
4170 AV *av = (AV *)SvRV (sem); 4149 AV *av = (AV *)SvRV (sem);
4171 4150
4172 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4151 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4173 && AvFILLp (av) == 0 /* no waiters, just count */ 4152 && AvFILLp (av) == 0 /* no waiters, just count */
4174 && SvIV (AvARRAY (av)[0]) == count) 4153 && SvIV (AvARRAY (av)[0]) == count)
4175 XSRETURN_YES; 4154 XSRETURN_YES;
… …
4196 4175
4197void 4176void
4198broadcast (SV *self) 4177broadcast (SV *self)
4199 CODE: 4178 CODE:
4200{ 4179{
4201 AV *av = (AV *)SvRV (self); 4180 AV *av = (AV *)SvRV (self);
4202 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4181 coro_signal_wake (aTHX_ av, AvFILLp (av));
4203} 4182}
4204 4183
4205void 4184void
4206send (SV *self) 4185send (SV *self)
… …
4214 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4193 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4215} 4194}
4216 4195
4217IV 4196IV
4218awaited (SV *self) 4197awaited (SV *self)
4219 CODE: 4198 CODE:
4220 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4199 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4221 OUTPUT: 4200 OUTPUT:
4222 RETVAL 4201 RETVAL
4223 4202
4224 4203
… …
4229 4208
4230void 4209void
4231_schedule (...) 4210_schedule (...)
4232 CODE: 4211 CODE:
4233{ 4212{
4234 static int incede; 4213 static int incede;
4235 4214
4236 api_cede_notself (aTHX); 4215 api_cede_notself (aTHX);
4237 4216
4238 ++incede; 4217 ++incede;
4239 while (coro_nready >= incede && api_cede (aTHX)) 4218 while (coro_nready >= incede && api_cede (aTHX))
… …
4283 { 4262 {
4284 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4263 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4285 coro_old_pp_sselect = 0; 4264 coro_old_pp_sselect = 0;
4286 } 4265 }
4287 4266
4267MODULE = Coro::State PACKAGE = Coro::Util
4268
4269void
4270_exit (int code)
4271 CODE:
4272 _exit (code);
4273
4274NV
4275time ()
4276 CODE:
4277 RETVAL = nvtime (aTHX);
4278 OUTPUT:
4279 RETVAL
4280
4281NV
4282gettimeofday ()
4283 PPCODE:
4284{
4285 UV tv [2];
4286 u2time (aTHX_ tv);
4287 EXTEND (SP, 2);
4288 PUSHs (sv_2mortal (newSVuv (tv [0])));
4289 PUSHs (sv_2mortal (newSVuv (tv [1])));
4290}
4291

Diff Legend

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