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.417 by root, Sun Feb 19 11:14:45 2012 UTC vs.
Revision 1.437 by root, Tue Nov 5 15:13:42 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
… …
101# if CORO_PTHREAD 91# if CORO_PTHREAD
102static void *coro_thx; 92static void *coro_thx;
103# endif 93# endif
104#endif 94#endif
105 95
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux 96#ifdef __linux
110# include <time.h> /* for timespec */ 97# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */ 98# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime 99# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 100# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
176typedef struct coro_cctx 163typedef struct coro_cctx
177{ 164{
178 struct coro_cctx *next; 165 struct coro_cctx *next;
179 166
180 /* the stack */ 167 /* the stack */
181 void *sptr; 168 struct coro_stack stack;
182 size_t ssize;
183 169
184 /* cpu state */ 170 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG 172#ifndef NDEBUG
187 JMPENV *idle_te; /* same as idle_sp, but for top_env */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
… …
213}; 199};
214 200
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 202typedef struct
217{ 203{
218#define VARx(name,expr,type) type name; 204 #define VARx(name,expr,type) type name;
219# include "state.h" 205 #include "state.h"
220#undef VARx
221} perl_slots; 206} perl_slots;
222 207
223/* how many context stack entries do we need for perl_slots */ 208/* how many context stack entries do we need for perl_slots */
224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
225 210
… …
297#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
298 283
299/** JIT *********************************************************************/ 284/** JIT *********************************************************************/
300 285
301#if CORO_JIT 286#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */ 287 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE 289 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY 290 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix" 291 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY 292 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix" 293 #define CORO_JIT_TYPE "x86-unix"
309 #endif 294 #endif
310 #endif 295 #endif
311#endif 296#endif
312 297
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT 299 #undef CORO_JIT
315#endif 300#endif
316 301
317#if CORO_JIT 302#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *); 303 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
375time_init (pTHX) 360time_init (pTHX)
376{ 361{
377 SV **svp; 362 SV **svp;
378 363
379 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
380 365
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382 367
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 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");
385 370
… …
526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
527 512
528/*****************************************************************************/ 513/*****************************************************************************/
529/* padlist management and caching */ 514/* padlist management and caching */
530 515
531ecb_inline AV * 516ecb_inline PADLIST *
532coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
533{ 518{
534 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
535 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
536 523
537 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. */
538 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
541#else
542 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
543#endif 553#endif
544 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
545 --AvFILLp (padlist);
546 554
547 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
548 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
549 559
550 return newpadlist; 560 return newpadlist;
551} 561}
552 562
553ecb_inline void 563ecb_inline void
554free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
555{ 565{
556 /* may be during global destruction */ 566 /* may be during global destruction */
557 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
558 { 568 {
559 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
560 570
561 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
562 { 572 {
563 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
564 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
565 I32 j = AvFILLp (av); 575 I32 j = PadMAX (pad);
566 576
567 while (j >= 0) 577 while (j >= 0)
568 SvREFCNT_dec (AvARRAY (av)[j--]); 578 SvREFCNT_dec (PadARRAY (pad)[j--]);
569 579
570 AvFILLp (av) = -1; 580 PadMAX (pad) = -1;
571 SvREFCNT_dec (av); 581 SvREFCNT_dec (pad);
572 } 582 }
573 583
574 SvREFCNT_dec (AvARRAY (padlist)[0]); 584 SvREFCNT_dec (PadlistNAMES (padlist));
575 585
586#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist);
589#else
576 AvFILLp (padlist) = -1; 590 AvFILLp (padlist) = -1;
591 AvREAL_off (padlist);
577 SvREFCNT_dec ((SV*)padlist); 592 SvREFCNT_dec ((SV*)padlist);
593#endif
578 } 594 }
579} 595}
580 596
581static int 597static int
582coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 598coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
583{ 599{
584 AV *padlist; 600 PADLIST *padlist;
585 AV *av = (AV *)mg->mg_obj; 601 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
602 size_t len = *(size_t *)mg->mg_ptr;
586 603
587 /* perl manages to free our internal AV and _then_ call us */ 604 /* perl manages to free our internal AV and _then_ call us */
588 if (IN_DESTRUCT) 605 if (IN_DESTRUCT)
589 return 0; 606 return 0;
590 607
591 /* casting is fun. */ 608 while (len--)
592 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
593 free_padlist (aTHX_ padlist); 609 free_padlist (aTHX_ padlists[len]);
594
595 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
596 610
597 return 0; 611 return 0;
598} 612}
599 613
600static MGVTBL coro_cv_vtbl = { 614static MGVTBL coro_cv_vtbl = {
… …
605/* the next two functions merely cache the padlists */ 619/* the next two functions merely cache the padlists */
606ecb_inline void 620ecb_inline void
607get_padlist (pTHX_ CV *cv) 621get_padlist (pTHX_ CV *cv)
608{ 622{
609 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
610 AV *av; 624 size_t *lenp;
611 625
612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 626 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 627 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
614 else 628 else
615 { 629 {
616#if CORO_PREFER_PERL_FUNCTIONS 630#if CORO_PREFER_PERL_FUNCTIONS
617 /* this is probably cleaner? but also slower! */ 631 /* this is probably cleaner? but also slower! */
618 /* in practise, it seems to be less stable */ 632 /* in practise, it seems to be less stable */
… …
628 642
629ecb_inline void 643ecb_inline void
630put_padlist (pTHX_ CV *cv) 644put_padlist (pTHX_ CV *cv)
631{ 645{
632 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
633 AV *av;
634 647
635 if (ecb_expect_false (!mg)) 648 if (ecb_expect_false (!mg))
649 {
636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 650 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
651 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
652 mg->mg_len = 1; /* so mg_free frees mg_ptr */
653 }
654 else
655 Renew (mg->mg_ptr,
656 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
657 char);
637 658
638 av = (AV *)mg->mg_obj; 659 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
639
640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
641 av_extend (av, AvFILLp (av) + 1);
642
643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
644} 660}
645 661
646/** load & save, init *******************************************************/ 662/** load & save, init *******************************************************/
647 663
648ecb_inline void 664ecb_inline void
… …
710 726
711#if CORO_JIT 727#if CORO_JIT
712 load_perl_slots (slot); 728 load_perl_slots (slot);
713#else 729#else
714 #define VARx(name,expr,type) expr = slot->name; 730 #define VARx(name,expr,type) expr = slot->name;
715 # include "state.h" 731 #include "state.h"
716 #undef VARx
717#endif 732#endif
718 733
719 { 734 {
720 dSP; 735 dSP;
721 736
… …
724 /* now do the ugly restore mess */ 739 /* now do the ugly restore mess */
725 while (ecb_expect_true (cv = (CV *)POPs)) 740 while (ecb_expect_true (cv = (CV *)POPs))
726 { 741 {
727 put_padlist (aTHX_ cv); /* mark this padlist as available */ 742 put_padlist (aTHX_ cv); /* mark this padlist as available */
728 CvDEPTH (cv) = PTR2IV (POPs); 743 CvDEPTH (cv) = PTR2IV (POPs);
729 CvPADLIST (cv) = (AV *)POPs; 744 CvPADLIST (cv) = (PADLIST *)POPs;
730 } 745 }
731 746
732 PUTBACK; 747 PUTBACK;
733 } 748 }
734 749
… …
843 858
844#if CORO_JIT 859#if CORO_JIT
845 save_perl_slots (slot); 860 save_perl_slots (slot);
846#else 861#else
847 #define VARx(name,expr,type) slot->name = expr; 862 #define VARx(name,expr,type) slot->name = expr;
848 # include "state.h" 863 #include "state.h"
849 #undef VARx
850#endif 864#endif
851 } 865 }
852} 866}
853 867
854/* 868/*
… …
998 { 1012 {
999 SV **svp = 0; 1013 SV **svp = 0;
1000 1014
1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1003 1017
1004 if (svp) 1018 if (svp)
1005 { 1019 {
1006 SV *ssv; 1020 SV *ssv;
1007 1021
1008 if (!*svp) 1022 if (!*svp)
… …
1114 PL_hints = 0; 1128 PL_hints = 0;
1115 1129
1116 /* recreate the die/warn hooks */ 1130 /* recreate the die/warn hooks */
1117 PL_diehook = SvREFCNT_inc (rv_diehook); 1131 PL_diehook = SvREFCNT_inc (rv_diehook);
1118 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1132 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1119 1133
1120 GvSV (PL_defgv) = newSV (0); 1134 GvSV (PL_defgv) = newSV (0);
1121 GvAV (PL_defgv) = coro->args; coro->args = 0; 1135 GvAV (PL_defgv) = coro->args; coro->args = 0;
1122 GvSV (PL_errgv) = newSV (0); 1136 GvSV (PL_errgv) = newSV (0);
1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1137 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1124 GvHV (PL_hintgv) = 0; 1138 GvHV (PL_hintgv) = 0;
… …
1410 1424
1411 slf_frame.prepare = slf_prepare_set_stacklevel; 1425 slf_frame.prepare = slf_prepare_set_stacklevel;
1412 slf_frame.check = slf_check_set_stacklevel; 1426 slf_frame.check = slf_check_set_stacklevel;
1413} 1427}
1414 1428
1429/* the tail of transfer: execute stuff we can only do after a transfer */
1430ecb_inline void
1431transfer_tail (pTHX)
1432{
1433 free_coro_mortal (aTHX);
1434}
1435
1415/* try to exit the same way perl's main function would do */ 1436/* try to exit the same way perl's main function would do */
1416/* we do not bother resetting the environment or other things *7 1437/* we do not bother resetting the environment or other things *7
1417/* that are not, uhm, essential */ 1438/* that are not, uhm, essential */
1418/* this obviously also doesn't work when perl is embedded */ 1439/* this obviously also doesn't work when perl is embedded */
1419static void ecb_noinline ecb_cold 1440static void ecb_noinline ecb_cold
1420perlish_exit (void) 1441perlish_exit (pTHX)
1421{ 1442{
1422 int exitstatus = perl_destruct (PL_curinterp); 1443 int exitstatus = perl_destruct (PL_curinterp);
1423 perl_free (PL_curinterp); 1444 perl_free (PL_curinterp);
1424 exit (exitstatus); 1445 exit (exitstatus);
1425}
1426
1427/* the tail of transfer: execute stuff we can only do after a transfer */
1428ecb_inline void
1429transfer_tail (pTHX)
1430{
1431 free_coro_mortal (aTHX);
1432} 1446}
1433 1447
1434/* 1448/*
1435 * this is a _very_ stripped down perl interpreter ;) 1449 * this is a _very_ stripped down perl interpreter ;)
1436 */ 1450 */
… …
1468 * If perl-run returns we assume exit() was being called or the coro 1482 * If perl-run returns we assume exit() was being called or the coro
1469 * fell off the end, which seems to be the only valid (non-bug) 1483 * fell off the end, which seems to be the only valid (non-bug)
1470 * reason for perl_run to return. We try to mimic whatever perl is normally 1484 * reason for perl_run to return. We try to mimic whatever perl is normally
1471 * doing in that case. YMMV. 1485 * doing in that case. YMMV.
1472 */ 1486 */
1473 perlish_exit (); 1487 perlish_exit (aTHX);
1474 } 1488 }
1475} 1489}
1476 1490
1477static coro_cctx * 1491static coro_cctx *
1478cctx_new (void) 1492cctx_new (void)
… …
1493static coro_cctx * 1507static coro_cctx *
1494cctx_new_empty (void) 1508cctx_new_empty (void)
1495{ 1509{
1496 coro_cctx *cctx = cctx_new (); 1510 coro_cctx *cctx = cctx_new ();
1497 1511
1498 cctx->sptr = 0; 1512 cctx->stack.sptr = 0;
1499 coro_create (&cctx->cctx, 0, 0, 0, 0); 1513 coro_create (&cctx->cctx, 0, 0, 0, 0);
1500 1514
1501 return cctx; 1515 return cctx;
1502} 1516}
1503 1517
1504/* create a new cctx suitable as destination/running a perl interpreter */ 1518/* create a new cctx suitable as destination/running a perl interpreter */
1505static coro_cctx * 1519static coro_cctx *
1506cctx_new_run (void) 1520cctx_new_run (void)
1507{ 1521{
1508 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1509 void *stack_start;
1510 size_t stack_size;
1511 1523
1512#if HAVE_MMAP 1524 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1513 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1514 /* mmap supposedly does allocate-on-write for us */
1515 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1516
1517 if (cctx->sptr != (void *)-1)
1518 {
1519 #if CORO_STACKGUARD
1520 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1521 #endif
1522 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1523 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1524 cctx->flags |= CC_MAPPED;
1525 } 1525 {
1526 else
1527#endif
1528 {
1529 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1530 New (0, cctx->sptr, cctx_stacksize, long);
1531
1532 if (!cctx->sptr)
1533 {
1534 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1526 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1535 _exit (EXIT_FAILURE); 1527 _exit (EXIT_FAILURE);
1536 }
1537
1538 stack_start = cctx->sptr;
1539 stack_size = cctx->ssize;
1540 } 1528 }
1541 1529
1542 #if CORO_USE_VALGRIND
1543 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1544 #endif
1545
1546 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1530 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1547 1531
1548 return cctx; 1532 return cctx;
1549} 1533}
1550 1534
1551static void 1535static void
… …
1557 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1541 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1558 1542
1559 --cctx_count; 1543 --cctx_count;
1560 coro_destroy (&cctx->cctx); 1544 coro_destroy (&cctx->cctx);
1561 1545
1562 /* coro_transfer creates new, empty cctx's */ 1546 coro_stack_free (&cctx->stack);
1563 if (cctx->sptr)
1564 {
1565 #if CORO_USE_VALGRIND
1566 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1567 #endif
1568
1569#if HAVE_MMAP
1570 if (cctx->flags & CC_MAPPED)
1571 munmap (cctx->sptr, cctx->ssize);
1572 else
1573#endif
1574 Safefree (cctx->sptr);
1575 }
1576 1547
1577 Safefree (cctx); 1548 Safefree (cctx);
1578} 1549}
1579 1550
1580/* wether this cctx should be destructed */ 1551/* wether this cctx should be destructed */
… …
1599} 1570}
1600 1571
1601static void 1572static void
1602cctx_put (coro_cctx *cctx) 1573cctx_put (coro_cctx *cctx)
1603{ 1574{
1604 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1575 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1605 1576
1606 /* free another cctx if overlimit */ 1577 /* free another cctx if overlimit */
1607 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1578 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1608 { 1579 {
1609 coro_cctx *first = cctx_first; 1580 coro_cctx *first = cctx_first;
… …
1735 return; 1706 return;
1736 1707
1737 slf_destroy (aTHX_ coro); 1708 slf_destroy (aTHX_ coro);
1738 1709
1739 coro->flags |= CF_ZOMBIE; 1710 coro->flags |= CF_ZOMBIE;
1740 1711
1741 if (coro->flags & CF_READY) 1712 if (coro->flags & CF_READY)
1742 { 1713 {
1743 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1714 /* reduce nready, as destroying a ready coro effectively unreadies it */
1744 /* alternative: look through all ready queues and remove the coro */ 1715 /* alternative: look through all ready queues and remove the coro */
1745 --coro_nready; 1716 --coro_nready;
… …
2149 AV *od = coro->on_destroy; 2120 AV *od = coro->on_destroy;
2150 2121
2151 if (!od) 2122 if (!od)
2152 return; 2123 return;
2153 2124
2125 coro->on_destroy = 0;
2126 sv_2mortal ((SV *)od);
2127
2154 while (AvFILLp (od) >= 0) 2128 while (AvFILLp (od) >= 0)
2155 { 2129 {
2156 SV *cb = sv_2mortal (av_pop (od)); 2130 SV *cb = sv_2mortal (av_pop (od));
2157 2131
2158 /* coro hv's (and only hv's at the moment) are supported as well */ 2132 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2178 2152
2179static void 2153static void
2180coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2154coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2181{ 2155{
2182 AV *av; 2156 AV *av;
2183 2157
2184 if (coro->status) 2158 if (coro->status)
2185 { 2159 {
2186 av = coro->status; 2160 av = coro->status;
2187 av_clear (av); 2161 av_clear (av);
2188 } 2162 }
… …
2235 2209
2236 coro = SvSTATE (arg [0]); 2210 coro = SvSTATE (arg [0]);
2237 coro_hv = coro->hv; 2211 coro_hv = coro->hv;
2238 2212
2239 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2213 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2240 2214
2241 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2215 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2242 { 2216 {
2243 /* coro currently busy cancelling something, so just notify it */ 2217 /* coro currently busy cancelling something, so just notify it */
2244 coro->slf_frame.data = (void *)coro; 2218 coro->slf_frame.data = (void *)coro;
2245 2219
… …
2424 2398
2425static int 2399static int
2426slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2400slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2427{ 2401{
2428 SV *data = (SV *)frame->data; 2402 SV *data = (SV *)frame->data;
2429 2403
2430 if (CORO_THROW) 2404 if (CORO_THROW)
2431 return 0; 2405 return 0;
2432 2406
2433 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2407 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2434 return 1; 2408 return 1;
… …
2470 cb = sv_2mortal (coro->rouse_cb); 2444 cb = sv_2mortal (coro->rouse_cb);
2471 coro->rouse_cb = 0; 2445 coro->rouse_cb = 0;
2472 } 2446 }
2473 2447
2474 if (!SvROK (cb) 2448 if (!SvROK (cb)
2475 || SvTYPE (SvRV (cb)) != SVt_PVCV 2449 || SvTYPE (SvRV (cb)) != SVt_PVCV
2476 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2450 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2477 croak ("Coro::rouse_wait called with illegal callback argument,"); 2451 croak ("Coro::rouse_wait called with illegal callback argument,");
2478 2452
2479 { 2453 {
2480 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3201 /* it quickly returns */ 3175 /* it quickly returns */
3202 if (CORO_THROW) 3176 if (CORO_THROW)
3203 return 0; 3177 return 0;
3204 3178
3205 /* one element that is an RV? repeat! */ 3179 /* one element that is an RV? repeat! */
3206 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3180 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3207 return 1; 3181 return 1;
3208 3182
3209 /* restore status */ 3183 /* restore status */
3210 { 3184 {
3211 SV *data_sv = av_pop (state); 3185 SV *data_sv = av_pop (state);
… …
3401 int count; 3375 int count;
3402 3376
3403 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3377 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3404 3378
3405 PUSHMARK (SP); 3379 PUSHMARK (SP);
3406#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3380 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3407# include "state.h" 3381 #include "state.h"
3408#undef VARx
3409 count = call_pv ("Coro::State::_jit", G_ARRAY); 3382 count = call_pv ("Coro::State::_jit", G_ARRAY);
3410 SPAGAIN; 3383 SPAGAIN;
3411 3384
3412 save = POPs; save_ptr = SvPVbyte (save, save_len); 3385 save = POPs; save_ptr = SvPVbyte (save, save_len);
3413 load = POPs; load_ptr = SvPVbyte (load, load_len); 3386 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3445#ifdef USE_ITHREADS 3418#ifdef USE_ITHREADS
3446# if CORO_PTHREAD 3419# if CORO_PTHREAD
3447 coro_thx = PERL_GET_CONTEXT; 3420 coro_thx = PERL_GET_CONTEXT;
3448# endif 3421# endif
3449#endif 3422#endif
3450 BOOT_PAGESIZE;
3451
3452 /* perl defines these to check for existance first, but why it doesn't */ 3423 /* perl defines these to check for existance first, but why it doesn't */
3453 /* just create them one at init time is not clear to me, except for */ 3424 /* just create them one at init time is not clear to me, except for */
3454 /* programs trying to delete them, but... */ 3425 /* programs trying to delete them, but... */
3455 /* anyway, we declare this as invalid and make sure they are initialised here */ 3426 /* anyway, we declare this as invalid and make sure they are initialised here */
3456 DEFSV; 3427 DEFSV;
… …
3526void 3497void
3527transfer (...) 3498transfer (...)
3528 PROTOTYPE: $$ 3499 PROTOTYPE: $$
3529 CODE: 3500 CODE:
3530 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3501 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3531
3532void
3533_exit (int code)
3534 PROTOTYPE: $
3535 CODE:
3536 _exit (code);
3537 3502
3538SV * 3503SV *
3539clone (Coro::State coro) 3504clone (Coro::State coro)
3540 CODE: 3505 CODE:
3541{ 3506{
… …
3596void 3561void
3597list () 3562list ()
3598 PROTOTYPE: 3563 PROTOTYPE:
3599 PPCODE: 3564 PPCODE:
3600{ 3565{
3601 struct coro *coro; 3566 struct coro *coro;
3602 for (coro = coro_first; coro; coro = coro->next) 3567 for (coro = coro_first; coro; coro = coro->next)
3603 if (coro->hv) 3568 if (coro->hv)
3604 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3569 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3605} 3570}
3606 3571
… …
3670 RETVAL = boolSV (coro->flags & ix); 3635 RETVAL = boolSV (coro->flags & ix);
3671 OUTPUT: 3636 OUTPUT:
3672 RETVAL 3637 RETVAL
3673 3638
3674void 3639void
3675throw (Coro::State self, SV *exception = &PL_sv_undef) 3640throw (SV *self, SV *exception = &PL_sv_undef)
3676 PROTOTYPE: $;$ 3641 PROTOTYPE: $;$
3677 CODE: 3642 CODE:
3678{ 3643{
3644 struct coro *coro = SvSTATE (self);
3679 struct coro *current = SvSTATE_current; 3645 struct coro *current = SvSTATE_current;
3680 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3646 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3681 SvREFCNT_dec (*exceptionp); 3647 SvREFCNT_dec (*exceptionp);
3682 SvGETMAGIC (exception); 3648 SvGETMAGIC (exception);
3683 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3649 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3650
3651 api_ready (aTHX_ self);
3684} 3652}
3685 3653
3686void 3654void
3687api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3655api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3688 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
… …
3765 3733
3766void 3734void
3767times (Coro::State self) 3735times (Coro::State self)
3768 PPCODE: 3736 PPCODE:
3769{ 3737{
3770 struct coro *current = SvSTATE (coro_current); 3738 struct coro *current = SvSTATE (coro_current);
3771 3739
3772 if (ecb_expect_false (current == self)) 3740 if (ecb_expect_false (current == self))
3773 { 3741 {
3774 coro_times_update (); 3742 coro_times_update ();
3775 coro_times_add (SvSTATE (coro_current)); 3743 coro_times_add (SvSTATE (coro_current));
… …
3818 3786
3819 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3787 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3820 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3788 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3821 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3789 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3822 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3790 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3823 3791
3824 coro_stash = gv_stashpv ("Coro", TRUE); 3792 coro_stash = gv_stashpv ("Coro", TRUE);
3825 3793
3826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3794 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3827 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3795 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3828 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3796 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4050 on_leave = 1 4018 on_leave = 1
4051 PROTOTYPE: & 4019 PROTOTYPE: &
4052 CODE: 4020 CODE:
4053{ 4021{
4054 struct coro *coro = SvSTATE_current; 4022 struct coro *coro = SvSTATE_current;
4055 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4023 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4056 4024
4057 block = s_get_cv_croak (block); 4025 block = s_get_cv_croak (block);
4058 4026
4059 if (!*avp) 4027 if (!*avp)
4060 *avp = newAV (); 4028 *avp = newAV ();
… …
4080 4048
4081SV * 4049SV *
4082new (SV *klass, SV *count = 0) 4050new (SV *klass, SV *count = 0)
4083 CODE: 4051 CODE:
4084{ 4052{
4085 int semcnt = 1; 4053 int semcnt = 1;
4086 4054
4087 if (count) 4055 if (count)
4088 { 4056 {
4089 SvGETMAGIC (count); 4057 SvGETMAGIC (count);
4090 4058
… …
4150 XSRETURN_NO; 4118 XSRETURN_NO;
4151} 4119}
4152 4120
4153void 4121void
4154waiters (SV *self) 4122waiters (SV *self)
4155 PPCODE: 4123 PPCODE:
4156{ 4124{
4157 AV *av = (AV *)SvRV (self); 4125 AV *av = (AV *)SvRV (self);
4158 int wcount = AvFILLp (av) + 1 - 1; 4126 int wcount = AvFILLp (av) + 1 - 1;
4159 4127
4160 if (GIMME_V == G_SCALAR) 4128 if (GIMME_V == G_SCALAR)
… …
4172 4140
4173void 4141void
4174_may_delete (SV *sem, int count, unsigned int extra_refs) 4142_may_delete (SV *sem, int count, unsigned int extra_refs)
4175 PPCODE: 4143 PPCODE:
4176{ 4144{
4177 AV *av = (AV *)SvRV (sem); 4145 AV *av = (AV *)SvRV (sem);
4178 4146
4179 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4147 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4180 && AvFILLp (av) == 0 /* no waiters, just count */ 4148 && AvFILLp (av) == 0 /* no waiters, just count */
4181 && SvIV (AvARRAY (av)[0]) == count) 4149 && SvIV (AvARRAY (av)[0]) == count)
4182 XSRETURN_YES; 4150 XSRETURN_YES;
… …
4203 4171
4204void 4172void
4205broadcast (SV *self) 4173broadcast (SV *self)
4206 CODE: 4174 CODE:
4207{ 4175{
4208 AV *av = (AV *)SvRV (self); 4176 AV *av = (AV *)SvRV (self);
4209 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4177 coro_signal_wake (aTHX_ av, AvFILLp (av));
4210} 4178}
4211 4179
4212void 4180void
4213send (SV *self) 4181send (SV *self)
… …
4221 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4189 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4222} 4190}
4223 4191
4224IV 4192IV
4225awaited (SV *self) 4193awaited (SV *self)
4226 CODE: 4194 CODE:
4227 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4195 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4228 OUTPUT: 4196 OUTPUT:
4229 RETVAL 4197 RETVAL
4230 4198
4231 4199
… …
4236 4204
4237void 4205void
4238_schedule (...) 4206_schedule (...)
4239 CODE: 4207 CODE:
4240{ 4208{
4241 static int incede; 4209 static int incede;
4242 4210
4243 api_cede_notself (aTHX); 4211 api_cede_notself (aTHX);
4244 4212
4245 ++incede; 4213 ++incede;
4246 while (coro_nready >= incede && api_cede (aTHX)) 4214 while (coro_nready >= incede && api_cede (aTHX))
… …
4290 { 4258 {
4291 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4259 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4292 coro_old_pp_sselect = 0; 4260 coro_old_pp_sselect = 0;
4293 } 4261 }
4294 4262
4263MODULE = Coro::State PACKAGE = Coro::Util
4264
4265void
4266_exit (int code)
4267 CODE:
4268 _exit (code);
4269
4270NV
4271time ()
4272 CODE:
4273 RETVAL = nvtime (aTHX);
4274 OUTPUT:
4275 RETVAL
4276
4277NV
4278gettimeofday ()
4279 PPCODE:
4280{
4281 UV tv [2];
4282 u2time (aTHX_ tv);
4283 EXTEND (SP, 2);
4284 PUSHs (sv_2mortal (newSVuv (tv [0])));
4285 PUSHs (sv_2mortal (newSVuv (tv [1])));
4286}
4287

Diff Legend

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