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.430 by root, Wed Dec 19 23:36:16 2012 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
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
26#endif 45#endif
27 46
28#if defined(_WIN32) 47#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 48# undef HAS_GETTIMEOFDAY
30# undef setjmp 49# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
34#else 53#else
35# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
36#endif 55#endif
37 56
38#if HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 57/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
67 59
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0) 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1 61# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
73# undef CORO_STACKGUARD
74#endif
75
76#ifndef CORO_STACKGUARD
77# define CORO_STACKGUARD 0
78#endif 62#endif
79 63
80/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
81#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
82# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
173typedef struct coro_cctx 157typedef struct coro_cctx
174{ 158{
175 struct coro_cctx *next; 159 struct coro_cctx *next;
176 160
177 /* the stack */ 161 /* the stack */
178 void *sptr; 162 struct coro_stack stack;
179 size_t ssize;
180 163
181 /* cpu state */ 164 /* cpu state */
182 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
183#ifndef NDEBUG 166#ifndef NDEBUG
184 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
293#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
294 277
295/** JIT *********************************************************************/ 278/** JIT *********************************************************************/
296 279
297#if CORO_JIT 280#if CORO_JIT
298 /* APPLE doesn't have HAVE_MMAP though */ 281 /* APPLE doesn't have mmap though */
299 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
300 #ifndef CORO_JIT_TYPE 283 #ifndef CORO_JIT_TYPE
301 #if __x86_64 && CORO_JIT_UNIXY 284 #if ECB_AMD64 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "amd64-unix" 285 #define CORO_JIT_TYPE "amd64-unix"
303 #elif __i386 && CORO_JIT_UNIXY 286 #elif __i386 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "x86-unix" 287 #define CORO_JIT_TYPE "x86-unix"
305 #endif 288 #endif
306 #endif 289 #endif
307#endif 290#endif
308 291
309#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
310 #undef CORO_JIT 293 #undef CORO_JIT
311#endif 294#endif
312 295
313#if CORO_JIT 296#if CORO_JIT
314 typedef void (*load_save_perl_slots_type)(perl_slots *); 297 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
371time_init (pTHX) 354time_init (pTHX)
372{ 355{
373 SV **svp; 356 SV **svp;
374 357
375 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
376 359
377 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
378 361
379 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
380 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
381 364
… …
522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
523 506
524/*****************************************************************************/ 507/*****************************************************************************/
525/* padlist management and caching */ 508/* padlist management and caching */
526 509
527ecb_inline AV * 510ecb_inline PADLIST *
528coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
529{ 512{
530 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
531 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
532 517
533 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
534 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
535#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
536 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
537#else 525#else
538 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
539#endif 527#endif
540 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
541 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
542 530
543 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
544 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
545 535
546 return newpadlist; 536 return newpadlist;
547} 537}
548 538
549ecb_inline void 539ecb_inline void
550free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
551{ 541{
552 /* may be during global destruction */ 542 /* may be during global destruction */
553 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
554 { 544 {
555 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
556 546
557 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
558 { 548 {
559 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
560 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
561 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
562 552
563 while (j >= 0) 553 while (j >= 0)
564 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
565 555
566 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
567 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
568 } 558 }
569 559
570 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
571 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
572 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
573 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
574 } 570 }
575} 571}
576 572
577static int 573static int
578coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
579{ 575{
580 AV *padlist; 576 PADLIST *padlist;
581 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
582 579
583 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
584 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
585 return 0; 582 return 0;
586 583
587 /* casting is fun. */ 584 while (len--)
588 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
589 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
590
591 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
592 586
593 return 0; 587 return 0;
594} 588}
595 589
596static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
… …
601/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
602ecb_inline void 596ecb_inline void
603get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
604{ 598{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 600 size_t *lenp;
607 601
608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
610 else 604 else
611 { 605 {
612#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
613 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
614 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
624 618
625ecb_inline void 619ecb_inline void
626put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
627{ 621{
628 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
629 AV *av;
630 623
631 if (ecb_expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
632 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
633 634
634 av = (AV *)mg->mg_obj; 635 ((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} 636}
641 637
642/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
643 639
644ecb_inline void 640ecb_inline void
… …
719 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
720 while (ecb_expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
721 { 717 {
722 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
723 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
724 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
725 } 721 }
726 722
727 PUTBACK; 723 PUTBACK;
728 } 724 }
729 725
… …
992 { 988 {
993 SV **svp = 0; 989 SV **svp = 0;
994 990
995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
997 993
998 if (svp) 994 if (svp)
999 { 995 {
1000 SV *ssv; 996 SV *ssv;
1001 997
1002 if (!*svp) 998 if (!*svp)
… …
1108 PL_hints = 0; 1104 PL_hints = 0;
1109 1105
1110 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1111 PL_diehook = SvREFCNT_inc (rv_diehook); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1112 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1113 1109
1114 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1115 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1116 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1117 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1118 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1416/* try to exit the same way perl's main function would do */ 1412/* try to exit the same way perl's main function would do */
1417/* we do not bother resetting the environment or other things *7 1413/* we do not bother resetting the environment or other things *7
1418/* that are not, uhm, essential */ 1414/* that are not, uhm, essential */
1419/* this obviously also doesn't work when perl is embedded */ 1415/* this obviously also doesn't work when perl is embedded */
1420static void ecb_noinline ecb_cold 1416static void ecb_noinline ecb_cold
1421perlish_exit (void) 1417perlish_exit (pTHX)
1422{ 1418{
1423 int exitstatus = perl_destruct (PL_curinterp); 1419 int exitstatus = perl_destruct (PL_curinterp);
1424 perl_free (PL_curinterp); 1420 perl_free (PL_curinterp);
1425 exit (exitstatus); 1421 exit (exitstatus);
1426} 1422}
… …
1462 * If perl-run returns we assume exit() was being called or the coro 1458 * 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) 1459 * 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 1460 * reason for perl_run to return. We try to mimic whatever perl is normally
1465 * doing in that case. YMMV. 1461 * doing in that case. YMMV.
1466 */ 1462 */
1467 perlish_exit (); 1463 perlish_exit (aTHX);
1468 } 1464 }
1469} 1465}
1470 1466
1471static coro_cctx * 1467static coro_cctx *
1472cctx_new (void) 1468cctx_new (void)
… …
1487static coro_cctx * 1483static coro_cctx *
1488cctx_new_empty (void) 1484cctx_new_empty (void)
1489{ 1485{
1490 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1491 1487
1492 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1493 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1494 1490
1495 return cctx; 1491 return cctx;
1496} 1492}
1497 1493
1498/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1499static coro_cctx * 1495static coro_cctx *
1500cctx_new_run (void) 1496cctx_new_run (void)
1501{ 1497{
1502 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1503 void *stack_start;
1504 size_t stack_size;
1505 1499
1506#if HAVE_MMAP 1500 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 } 1501 {
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."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1529 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1530 }
1531
1532 stack_start = cctx->sptr;
1533 stack_size = cctx->ssize;
1534 } 1504 }
1535 1505
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); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1541 1507
1542 return cctx; 1508 return cctx;
1543} 1509}
1544 1510
1545static void 1511static void
… …
1551 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1552 1518
1553 --cctx_count; 1519 --cctx_count;
1554 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1555 1521
1556 /* coro_transfer creates new, empty cctx's */ 1522 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 1523
1571 Safefree (cctx); 1524 Safefree (cctx);
1572} 1525}
1573 1526
1574/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
… …
1593} 1546}
1594 1547
1595static void 1548static void
1596cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1597{ 1550{
1598 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1599 1552
1600 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1602 { 1555 {
1603 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
… …
1729 return; 1682 return;
1730 1683
1731 slf_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1732 1685
1733 coro->flags |= CF_ZOMBIE; 1686 coro->flags |= CF_ZOMBIE;
1734 1687
1735 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1736 { 1689 {
1737 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1738 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1739 --coro_nready; 1692 --coro_nready;
… …
2172 2125
2173static void 2126static void
2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2175{ 2128{
2176 AV *av; 2129 AV *av;
2177 2130
2178 if (coro->status) 2131 if (coro->status)
2179 { 2132 {
2180 av = coro->status; 2133 av = coro->status;
2181 av_clear (av); 2134 av_clear (av);
2182 } 2135 }
… …
2229 2182
2230 coro = SvSTATE (arg [0]); 2183 coro = SvSTATE (arg [0]);
2231 coro_hv = coro->hv; 2184 coro_hv = coro->hv;
2232 2185
2233 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2234 2187
2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2236 { 2189 {
2237 /* coro currently busy cancelling something, so just notify it */ 2190 /* coro currently busy cancelling something, so just notify it */
2238 coro->slf_frame.data = (void *)coro; 2191 coro->slf_frame.data = (void *)coro;
2239 2192
… …
2418 2371
2419static int 2372static int
2420slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2421{ 2374{
2422 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2423 2376
2424 if (CORO_THROW) 2377 if (CORO_THROW)
2425 return 0; 2378 return 0;
2426 2379
2427 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2428 return 1; 2381 return 1;
… …
2464 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2465 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2466 } 2419 }
2467 2420
2468 if (!SvROK (cb) 2421 if (!SvROK (cb)
2469 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2470 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2471 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2472 2425
2473 { 2426 {
2474 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3438#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
3439# if CORO_PTHREAD 3392# if CORO_PTHREAD
3440 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
3441# endif 3394# endif
3442#endif 3395#endif
3443 BOOT_PAGESIZE;
3444
3445 /* perl defines these to check for existance first, but why it doesn't */ 3396 /* 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 */ 3397 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */ 3398 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */ 3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV; 3400 DEFSV;
… …
3589void 3540void
3590list () 3541list ()
3591 PROTOTYPE: 3542 PROTOTYPE:
3592 PPCODE: 3543 PPCODE:
3593{ 3544{
3594 struct coro *coro; 3545 struct coro *coro;
3595 for (coro = coro_first; coro; coro = coro->next) 3546 for (coro = coro_first; coro; coro = coro->next)
3596 if (coro->hv) 3547 if (coro->hv)
3597 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3548 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3598} 3549}
3599 3550
… …
3663 RETVAL = boolSV (coro->flags & ix); 3614 RETVAL = boolSV (coro->flags & ix);
3664 OUTPUT: 3615 OUTPUT:
3665 RETVAL 3616 RETVAL
3666 3617
3667void 3618void
3668throw (Coro::State self, SV *exception = &PL_sv_undef) 3619throw (SV *self, SV *exception = &PL_sv_undef)
3669 PROTOTYPE: $;$ 3620 PROTOTYPE: $;$
3670 CODE: 3621 CODE:
3671{ 3622{
3623 struct coro *coro = SvSTATE (self);
3672 struct coro *current = SvSTATE_current; 3624 struct coro *current = SvSTATE_current;
3673 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3625 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3674 SvREFCNT_dec (*exceptionp); 3626 SvREFCNT_dec (*exceptionp);
3675 SvGETMAGIC (exception); 3627 SvGETMAGIC (exception);
3676 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3628 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3629
3630 api_ready (aTHX_ self);
3677} 3631}
3678 3632
3679void 3633void
3680api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3634api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3681 PROTOTYPE: $;$ 3635 PROTOTYPE: $;$
… …
3758 3712
3759void 3713void
3760times (Coro::State self) 3714times (Coro::State self)
3761 PPCODE: 3715 PPCODE:
3762{ 3716{
3763 struct coro *current = SvSTATE (coro_current); 3717 struct coro *current = SvSTATE (coro_current);
3764 3718
3765 if (ecb_expect_false (current == self)) 3719 if (ecb_expect_false (current == self))
3766 { 3720 {
3767 coro_times_update (); 3721 coro_times_update ();
3768 coro_times_add (SvSTATE (coro_current)); 3722 coro_times_add (SvSTATE (coro_current));
… …
3811 3765
3812 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3766 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); 3767 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); 3768 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 */ 3769 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3816 3770
3817 coro_stash = gv_stashpv ("Coro", TRUE); 3771 coro_stash = gv_stashpv ("Coro", TRUE);
3818 3772
3819 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3773 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3820 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3774 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3821 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3775 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4043 on_leave = 1 3997 on_leave = 1
4044 PROTOTYPE: & 3998 PROTOTYPE: &
4045 CODE: 3999 CODE:
4046{ 4000{
4047 struct coro *coro = SvSTATE_current; 4001 struct coro *coro = SvSTATE_current;
4048 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4002 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4049 4003
4050 block = s_get_cv_croak (block); 4004 block = s_get_cv_croak (block);
4051 4005
4052 if (!*avp) 4006 if (!*avp)
4053 *avp = newAV (); 4007 *avp = newAV ();
… …
4073 4027
4074SV * 4028SV *
4075new (SV *klass, SV *count = 0) 4029new (SV *klass, SV *count = 0)
4076 CODE: 4030 CODE:
4077{ 4031{
4078 int semcnt = 1; 4032 int semcnt = 1;
4079 4033
4080 if (count) 4034 if (count)
4081 { 4035 {
4082 SvGETMAGIC (count); 4036 SvGETMAGIC (count);
4083 4037
… …
4143 XSRETURN_NO; 4097 XSRETURN_NO;
4144} 4098}
4145 4099
4146void 4100void
4147waiters (SV *self) 4101waiters (SV *self)
4148 PPCODE: 4102 PPCODE:
4149{ 4103{
4150 AV *av = (AV *)SvRV (self); 4104 AV *av = (AV *)SvRV (self);
4151 int wcount = AvFILLp (av) + 1 - 1; 4105 int wcount = AvFILLp (av) + 1 - 1;
4152 4106
4153 if (GIMME_V == G_SCALAR) 4107 if (GIMME_V == G_SCALAR)
… …
4165 4119
4166void 4120void
4167_may_delete (SV *sem, int count, unsigned int extra_refs) 4121_may_delete (SV *sem, int count, unsigned int extra_refs)
4168 PPCODE: 4122 PPCODE:
4169{ 4123{
4170 AV *av = (AV *)SvRV (sem); 4124 AV *av = (AV *)SvRV (sem);
4171 4125
4172 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4126 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4173 && AvFILLp (av) == 0 /* no waiters, just count */ 4127 && AvFILLp (av) == 0 /* no waiters, just count */
4174 && SvIV (AvARRAY (av)[0]) == count) 4128 && SvIV (AvARRAY (av)[0]) == count)
4175 XSRETURN_YES; 4129 XSRETURN_YES;
… …
4196 4150
4197void 4151void
4198broadcast (SV *self) 4152broadcast (SV *self)
4199 CODE: 4153 CODE:
4200{ 4154{
4201 AV *av = (AV *)SvRV (self); 4155 AV *av = (AV *)SvRV (self);
4202 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4156 coro_signal_wake (aTHX_ av, AvFILLp (av));
4203} 4157}
4204 4158
4205void 4159void
4206send (SV *self) 4160send (SV *self)
… …
4214 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4168 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4215} 4169}
4216 4170
4217IV 4171IV
4218awaited (SV *self) 4172awaited (SV *self)
4219 CODE: 4173 CODE:
4220 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4174 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4221 OUTPUT: 4175 OUTPUT:
4222 RETVAL 4176 RETVAL
4223 4177
4224 4178
… …
4229 4183
4230void 4184void
4231_schedule (...) 4185_schedule (...)
4232 CODE: 4186 CODE:
4233{ 4187{
4234 static int incede; 4188 static int incede;
4235 4189
4236 api_cede_notself (aTHX); 4190 api_cede_notself (aTHX);
4237 4191
4238 ++incede; 4192 ++incede;
4239 while (coro_nready >= incede && api_cede (aTHX)) 4193 while (coro_nready >= incede && api_cede (aTHX))

Diff Legend

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