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.415 by root, Tue Aug 30 07:48:53 2011 UTC vs.
Revision 1.423 by root, Mon Oct 8 23:13:36 2012 UTC

… …
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>
… …
101# if CORO_PTHREAD 103# if CORO_PTHREAD
102static void *coro_thx; 104static void *coro_thx;
103# endif 105# endif
104#endif 106#endif
105 107
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux 108#ifdef __linux
110# include <time.h> /* for timespec */ 109# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */ 110# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime 111# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 112# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
181 void *sptr; 180 void *sptr;
182 size_t ssize; 181 size_t ssize;
183 182
184 /* cpu state */ 183 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 186 JMPENV *idle_te; /* same as idle_sp, but for top_env */
187#endif
187 JMPENV *top_env; 188 JMPENV *top_env;
188 coro_context cctx; 189 coro_context cctx;
189 190
190 U32 gen; 191 U32 gen;
191#if CORO_USE_VALGRIND 192#if CORO_USE_VALGRIND
… …
211}; 212};
212 213
213/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
214typedef struct 215typedef struct
215{ 216{
216#define VARx(name,expr,type) type name; 217 #define VARx(name,expr,type) type name;
217# include "state.h" 218 #include "state.h"
218#undef VARx
219} perl_slots; 219} perl_slots;
220 220
221/* how many context stack entries do we need for perl_slots */ 221/* how many context stack entries do we need for perl_slots */
222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 223
… …
641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
642} 642}
643 643
644/** load & save, init *******************************************************/ 644/** load & save, init *******************************************************/
645 645
646ecb_inline void
647swap_sv (SV *a, SV *b)
648{
649 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
650 SV tmp;
651
652 /* swap sv_any */
653 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
654
655 /* swap sv_flags */
656 SvFLAGS (&tmp) = SvFLAGS (a);
657 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
658 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
659
660#if PERL_VERSION_ATLEAST (5,10,0)
661 /* perl 5.10 and later complicates this _quite_ a bit, but it also
662 * is much faster, so no quarrels here. alternatively, we could
663 * sv_upgrade to avoid this.
664 */
665 {
666 /* swap sv_u */
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668
669 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa.
671 */
672 #define svany_in_head(type) \
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
674
675 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677
678 if (svany_in_head (SvTYPE (b)))
679 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
680 }
681#endif
682}
683
646/* swap sv heads, at least logically */ 684/* swap sv heads, at least logically */
647static void 685static void
648swap_svs (pTHX_ Coro__State c) 686swap_svs (pTHX_ Coro__State c)
649{ 687{
650 int i; 688 int i;
651 689
652 for (i = 0; i <= AvFILLp (c->swap_sv); ) 690 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
653 { 691 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
654 SV *a = AvARRAY (c->swap_sv)[i++];
655 SV *b = AvARRAY (c->swap_sv)[i++];
656
657 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
658 SV tmp;
659
660 /* swap sv_any */
661 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
662
663 /* swap sv_flags */
664 SvFLAGS (&tmp) = SvFLAGS (a);
665 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
666 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
667
668#if PERL_VERSION_ATLEAST (5,10,0)
669 /* perl 5.10 complicates this _quite_ a bit, but it also is
670 * much faster, so no quarrels here. alternatively, we could
671 * sv_upgrade to avoid this.
672 */
673 {
674 /* swap sv_u */
675 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
676
677 /* if SvANY points to the head, we need to adjust the pointers,
678 * as the pointer for a still points to b, and maybe vice versa.
679 */
680 #define svany_in_head(type) \
681 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
682
683 if (svany_in_head (SvTYPE (a)))
684 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
685
686 if (svany_in_head (SvTYPE (b)))
687 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
688 }
689#endif
690 }
691} 692}
692 693
693#define SWAP_SVS(coro) \ 694#define SWAP_SVS(coro) \
694 if (ecb_expect_false ((coro)->swap_sv)) \ 695 if (ecb_expect_false ((coro)->swap_sv)) \
695 swap_svs (aTHX_ (coro)) 696 swap_svs (aTHX_ (coro))
… …
707 708
708#if CORO_JIT 709#if CORO_JIT
709 load_perl_slots (slot); 710 load_perl_slots (slot);
710#else 711#else
711 #define VARx(name,expr,type) expr = slot->name; 712 #define VARx(name,expr,type) expr = slot->name;
712 # include "state.h" 713 #include "state.h"
713 #undef VARx
714#endif 714#endif
715 715
716 { 716 {
717 dSP; 717 dSP;
718 718
… …
840 840
841#if CORO_JIT 841#if CORO_JIT
842 save_perl_slots (slot); 842 save_perl_slots (slot);
843#else 843#else
844 #define VARx(name,expr,type) slot->name = expr; 844 #define VARx(name,expr,type) slot->name = expr;
845 # include "state.h" 845 #include "state.h"
846 #undef VARx
847#endif 846#endif
848 } 847 }
849} 848}
850 849
851/* 850/*
… …
1414transfer_tail (pTHX) 1413transfer_tail (pTHX)
1415{ 1414{
1416 free_coro_mortal (aTHX); 1415 free_coro_mortal (aTHX);
1417} 1416}
1418 1417
1418/* try to exit the same way perl's main function would do */
1419/* we do not bother resetting the environment or other things *7
1420/* that are not, uhm, essential */
1421/* this obviously also doesn't work when perl is embedded */
1422static void ecb_noinline ecb_cold
1423perlish_exit (pTHX)
1424{
1425 int exitstatus = perl_destruct (PL_curinterp);
1426 perl_free (PL_curinterp);
1427 exit (exitstatus);
1428}
1429
1419/* 1430/*
1420 * this is a _very_ stripped down perl interpreter ;) 1431 * this is a _very_ stripped down perl interpreter ;)
1421 */ 1432 */
1422static void 1433static void
1423cctx_run (void *arg) 1434cctx_run (void *arg)
… …
1450 */ 1461 */
1451 1462
1452 /* 1463 /*
1453 * If perl-run returns we assume exit() was being called or the coro 1464 * If perl-run returns we assume exit() was being called or the coro
1454 * fell off the end, which seems to be the only valid (non-bug) 1465 * fell off the end, which seems to be the only valid (non-bug)
1455 * reason for perl_run to return. We try to exit by jumping to the 1466 * reason for perl_run to return. We try to mimic whatever perl is normally
1456 * bootstrap-time "top" top_env, as we cannot restore the "main" 1467 * doing in that case. YMMV.
1457 * coroutine as Coro has no such concept.
1458 * This actually isn't valid with the pthread backend, but OSes requiring
1459 * that backend are too broken to do it in a standards-compliant way.
1460 */ 1468 */
1461 PL_top_env = main_top_env; 1469 perlish_exit (aTHX);
1462 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1463 } 1470 }
1464} 1471}
1465 1472
1466static coro_cctx * 1473static coro_cctx *
1467cctx_new (void) 1474cctx_new (void)
… …
1499 size_t stack_size; 1506 size_t stack_size;
1500 1507
1501#if HAVE_MMAP 1508#if HAVE_MMAP
1502 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1509 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1503 /* mmap supposedly does allocate-on-write for us */ 1510 /* mmap supposedly does allocate-on-write for us */
1504 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0); 1511 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1505 1512
1506 if (cctx->sptr != (void *)-1) 1513 if (cctx->sptr != (void *)-1)
1507 { 1514 {
1508 #if CORO_STACKGUARD 1515 #if CORO_STACKGUARD
1509 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1516 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
3390 int count; 3397 int count;
3391 3398
3392 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3399 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3393 3400
3394 PUSHMARK (SP); 3401 PUSHMARK (SP);
3395#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type)); 3402 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3396# include "state.h" 3403 #include "state.h"
3397#undef VARx
3398 count = call_pv ("Coro::State::_jit", G_ARRAY); 3404 count = call_pv ("Coro::State::_jit", G_ARRAY);
3399 SPAGAIN; 3405 SPAGAIN;
3400 3406
3401 save = POPs; save_ptr = SvPVbyte (save, save_len); 3407 save = POPs; save_ptr = SvPVbyte (save, save_len);
3402 load = POPs; load_ptr = SvPVbyte (load, load_len); 3408 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3659 RETVAL = boolSV (coro->flags & ix); 3665 RETVAL = boolSV (coro->flags & ix);
3660 OUTPUT: 3666 OUTPUT:
3661 RETVAL 3667 RETVAL
3662 3668
3663void 3669void
3664throw (Coro::State self, SV *exception = &PL_sv_undef) 3670throw (SV *self, SV *exception = &PL_sv_undef)
3665 PROTOTYPE: $;$ 3671 PROTOTYPE: $;$
3666 CODE: 3672 CODE:
3667{ 3673{
3674 struct coro *coro = SvSTATE (self);
3668 struct coro *current = SvSTATE_current; 3675 struct coro *current = SvSTATE_current;
3669 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3676 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3670 SvREFCNT_dec (*exceptionp); 3677 SvREFCNT_dec (*exceptionp);
3671 SvGETMAGIC (exception); 3678 SvGETMAGIC (exception);
3672 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3679 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3680
3681 api_ready (aTHX_ self);
3673} 3682}
3674 3683
3675void 3684void
3676api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3685api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3677 PROTOTYPE: $;$ 3686 PROTOTYPE: $;$

Diff Legend

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