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.200 by root, Sun Oct 7 15:08:23 2007 UTC vs.
Revision 1.223 by root, Wed Feb 13 15:46:00 2008 UTC

… …
10#include "patchlevel.h" 10#include "patchlevel.h"
11 11
12#include <stdio.h> 12#include <stdio.h>
13#include <errno.h> 13#include <errno.h>
14#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
15 16
16#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
17# include <unistd.h> 18# include <unistd.h>
18# include <sys/mman.h> 19# include <sys/mman.h>
19# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
… …
71# ifndef IS_PADCONST 72# ifndef IS_PADCONST
72# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
73# endif 74# endif
74#endif 75#endif
75 76
77/* 5.8.8 */
78#ifndef GV_NOTQUAL
79# define GV_NOTQUAL 0
80#endif
81#ifndef newSV
82# define newSV(l) NEWSV(0,l)
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
76/* 5.8.7 */ 90/* 5.8.7 */
77#ifndef SvRV_set 91#ifndef SvRV_set
78# define SvRV_set(s,v) SvRV(s) = (v) 92# define SvRV_set(s,v) SvRV(s) = (v)
79#endif
80
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif 93#endif
88 94
89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 95#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
90# undef CORO_STACKGUARD 96# undef CORO_STACKGUARD
91#endif 97#endif
… …
130#else 136#else
131# define LOCK (void)0 137# define LOCK (void)0
132# define UNLOCK (void)0 138# define UNLOCK (void)0
133#endif 139#endif
134 140
135#define strpair(const) const, sizeof (const) - 1
136
137/* helper storage struct for Coro::AIO */ 141/* helper storage struct for Coro::AIO */
138struct io_state 142struct io_state
139{ 143{
140 int errorno; 144 int errorno;
141 I32 laststype; 145 I32 laststype;
… …
146static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
147static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
148static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
149static JMPENV *main_top_env; 153static JMPENV *main_top_env;
150static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
151static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
152 156
153static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
155 159static SV *rv_diehook;
160static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */ 161static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
159 162
160/* async_pool helper stuff */ 163/* async_pool helper stuff */
161static SV *sv_pool_rss; 164static SV *sv_pool_rss;
162static SV *sv_pool_size; 165static SV *sv_pool_size;
163static AV *av_async_pool; 166static AV *av_async_pool;
… …
221 224
222 /* process data */ 225 /* process data */
223 AV *mainstack; 226 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */ 227 perl_slots *slot; /* basically the saved sp */
225 228
226 /* data associated with this coroutine (initial args) */ 229 AV *args; /* data associated with this coroutine (initial args) */
227 AV *args; 230 int refcnt; /* coroutines are refcounted, yes */
228 int refcnt;
229 int flags; /* CF_ flags */ 231 int flags; /* CF_ flags */
232 HV *hv; /* the perl hash associated with this coro, if any */
230 233
231 /* statistics */ 234 /* statistics */
232 int usecount; /* number of transfers to this coro */ 235 int usecount; /* number of transfers to this coro */
233 236
234 /* coro process data */ 237 /* coro process data */
235 int prio; 238 int prio;
236 SV *throw; 239 SV *throw; /* exception to be thrown */
237 240
238 /* async_pool */ 241 /* async_pool */
239 SV *saved_deffh; 242 SV *saved_deffh;
240 243
241 /* linked list */ 244 /* linked list */
242 struct coro *next, *prev; 245 struct coro *next, *prev;
243 HV *hv; /* the perl hash associated with this coro, if any */
244}; 246};
245 247
246typedef struct coro *Coro__State; 248typedef struct coro *Coro__State;
247typedef struct coro *Coro__State_or_hashref; 249typedef struct coro *Coro__State_or_hashref;
248 250
… …
262static struct coro *coro_first; 264static struct coro *coro_first;
263 265
264/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
265 267
266static SV * 268static SV *
267coro_get_sv (const char *name, int create) 269coro_get_sv (pTHX_ const char *name, int create)
268{ 270{
269#if PERL_VERSION_ATLEAST (5,9,0) 271#if PERL_VERSION_ATLEAST (5,9,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 272 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create); 273 get_sv (name, create);
272#endif 274#endif
273 return get_sv (name, create); 275 return get_sv (name, create);
274} 276}
275 277
276static AV * 278static AV *
277coro_get_av (const char *name, int create) 279coro_get_av (pTHX_ const char *name, int create)
278{ 280{
279#if PERL_VERSION_ATLEAST (5,9,0) 281#if PERL_VERSION_ATLEAST (5,9,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 282 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create); 283 get_av (name, create);
282#endif 284#endif
283 return get_av (name, create); 285 return get_av (name, create);
284} 286}
285 287
286static HV * 288static HV *
287coro_get_hv (const char *name, int create) 289coro_get_hv (pTHX_ const char *name, int create)
288{ 290{
289#if PERL_VERSION_ATLEAST (5,9,0) 291#if PERL_VERSION_ATLEAST (5,9,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 292 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create); 293 get_hv (name, create);
292#endif 294#endif
… …
347 349
348 /* casting is fun. */ 350 /* casting is fun. */
349 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
350 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
351 353
352 SvREFCNT_dec (av);
353
354 return 0; 354 return 0;
355} 355}
356 356
357#define PERL_MAGIC_coro PERL_MAGIC_ext 357#define CORO_MAGIC_type_cv PERL_MAGIC_ext
358#define CORO_MAGIC_type_state PERL_MAGIC_ext
358 359
359static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 360static MGVTBL coro_cv_vtbl = {
361 0, 0, 0, 0,
362 coro_cv_free
363};
360 364
361#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
362 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
363 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
364 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
365 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
366 : 0 370 : 0
371
372#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
373#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
367 374
368static struct coro * 375static struct coro *
369SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
370{ 377{
371 HV *stash; 378 HV *stash;
… …
383 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
385 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
386 } 393 }
387 394
388 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
389 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
390} 397}
391 398
392#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
393 400
394/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
395static void 402static void
396get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
397{ 404{
398 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
399 AV *av; 406 AV *av;
400 407
401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
403 else 410 else
… …
415} 422}
416 423
417static void 424static void
418put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
419{ 426{
420 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
421 AV *av; 428 AV *av;
422 429
423 if (expect_false (!mg)) 430 if (expect_false (!mg))
424 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
427 mg->mg_virtual = &vtbl_coro;
428 mg->mg_obj = (SV *)newAV ();
429 }
430 432
431 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
432 434
433 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
434 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
… …
521 523
522 PUTBACK; 524 PUTBACK;
523 } 525 }
524 526
525 /* allocate some space on the context stack for our purposes */ 527 /* allocate some space on the context stack for our purposes */
528 /* we manually unroll here, as usually 2 slots is enough */
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
526 { 532 {
527 /* we manually unroll here, as usually 2 slots is enough */
528 int i; 533 int i;
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
532 for (i = 3; i < SLOT_COUNT; ++i) 534 for (i = 3; i < SLOT_COUNT; ++i)
533 CXINC; 535 CXINC;
534
535 cxstack_ix -= SLOT_COUNT; /* undo allocation */
536 } 536 }
537 cxstack_ix -= SLOT_COUNT; /* undo allocation */
537 538
538 c->mainstack = PL_mainstack; 539 c->mainstack = PL_mainstack;
539 540
540 { 541 {
541 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 542 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
668 return rss; 669 return rss;
669} 670}
670 671
671/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
672 673
674static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
675static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
676
677/*
678 * This overrides the default magic get method of %SIG elements.
679 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
680 * and instead of tryign to save and restore the hash elements, we just provide
681 * readback here.
682 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
683 * not expecting this to actually change the hook. This is a potential problem
684 * when a schedule happens then, but we ignore this.
685 */
686static int
687coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
688{
689 const char *s = MgPV_nolen_const (mg);
690
691 if (*s == '_')
692 {
693 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
694 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
695 }
696
697 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
698}
699
700static int
701coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
702{
703 const char *s = MgPV_nolen_const (mg);
704
705 if (*s == '_')
706 {
707 SV **svp = 0;
708
709 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
710 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
711
712 if (svp)
713 {
714 SV *old = *svp;
715 *svp = newSVsv (sv);
716 SvREFCNT_dec (old);
717 return;
718 }
719 }
720
721 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
722}
723
673static void 724static void
674coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
675{ 726{
676 /* 727 /*
677 * emulate part of the perl startup here. 728 * emulate part of the perl startup here.
… …
685 PL_curpm = 0; 736 PL_curpm = 0;
686 PL_curpad = 0; 737 PL_curpad = 0;
687 PL_localizing = 0; 738 PL_localizing = 0;
688 PL_dirty = 0; 739 PL_dirty = 0;
689 PL_restartop = 0; 740 PL_restartop = 0;
690 SvREFCNT_inc (PL_diehook ); hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 741
691 SvREFCNT_inc (PL_warnhook); hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 742 /* recreate the die/warn hooks */
743 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
744 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
692 745
693 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 749 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
711 PL_op = (OP *)&myop; 764 PL_op = (OP *)&myop;
712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 765 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
713 SPAGAIN; 766 SPAGAIN;
714 } 767 }
715 768
716 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 769 /* this newly created coroutine might be run on an existing cctx which most
770 * likely was suspended in set_stacklevel, called from entersub.
771 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
772 * so we ENTER here for symmetry
773 */
774 ENTER;
717} 775}
718 776
719static void 777static void
720coro_destroy (pTHX_ struct coro *coro) 778coro_destroy (pTHX_ struct coro *coro)
721{ 779{
… …
805 PUSHMARK (SP); 863 PUSHMARK (SP);
806 PUSHs (&PL_sv_no); 864 PUSHs (&PL_sv_no);
807 PUSHs (fullname); 865 PUSHs (fullname);
808 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 866 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
809 PUTBACK; 867 PUTBACK;
810 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 868 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
811 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 869 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
812 SPAGAIN; 870 SPAGAIN;
813 FREETMPS; 871 FREETMPS;
814 LEAVE; 872 LEAVE;
815 PL_runops = runops_trace; 873 PL_runops = runops_trace;
… …
842 SAVETMPS; 900 SAVETMPS;
843 EXTEND (SP, 3); 901 EXTEND (SP, 3);
844 PUSHMARK (SP); 902 PUSHMARK (SP);
845 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
846 PUSHs (fullname); 904 PUSHs (fullname);
847 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 905 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
848 PUTBACK; 906 PUTBACK;
849 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 907 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
850 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 908 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
851 SPAGAIN; 909 SPAGAIN;
852 FREETMPS; 910 FREETMPS;
853 LEAVE; 911 LEAVE;
854 PL_runops = runops_trace; 912 PL_runops = runops_trace;
… …
868 PL_runops = RUNOPS_DEFAULT; 926 PL_runops = RUNOPS_DEFAULT;
869 PUSHMARK (SP); 927 PUSHMARK (SP);
870 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 928 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
871 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 929 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
872 PUTBACK; 930 PUTBACK;
873 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 931 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
874 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 932 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
875 SPAGAIN; 933 SPAGAIN;
876 FREETMPS; 934 FREETMPS;
877 LEAVE; 935 LEAVE;
878 PL_runops = runops_trace; 936 PL_runops = runops_trace;
… …
888 946
889/* inject a fake call to Coro::State::_cctx_init into the execution */ 947/* inject a fake call to Coro::State::_cctx_init into the execution */
890/* _cctx_init should be careful, as it could be called at almost any time */ 948/* _cctx_init should be careful, as it could be called at almost any time */
891/* during execution of a perl program */ 949/* during execution of a perl program */
892static void NOINLINE 950static void NOINLINE
893prepare_cctx (pTHX_ coro_cctx *cctx) 951cctx_prepare (pTHX_ coro_cctx *cctx)
894{ 952{
895 dSP; 953 dSP;
896 LOGOP myop; 954 LOGOP myop;
897 955
898 PL_top_env = &PL_start_env; 956 PL_top_env = &PL_start_env;
… …
916 974
917/* 975/*
918 * this is a _very_ stripped down perl interpreter ;) 976 * this is a _very_ stripped down perl interpreter ;)
919 */ 977 */
920static void 978static void
921coro_run (void *arg) 979cctx_run (void *arg)
922{ 980{
923 dTHX; 981 dTHX;
924 982
925 /* coro_run is the alternative tail of transfer(), so unlock here. */ 983 /* cctx_run is the alternative tail of transfer(), so unlock here. */
926 UNLOCK; 984 UNLOCK;
927 985
928 /* we now skip the entersub that lead to transfer() */ 986 /* we now skip the entersub that lead to transfer() */
929 PL_op = PL_op->op_next; 987 PL_op = PL_op->op_next;
930 988
931 /* inject a fake subroutine call to cctx_init */ 989 /* inject a fake subroutine call to cctx_init */
932 prepare_cctx (aTHX_ (coro_cctx *)arg); 990 cctx_prepare (aTHX_ (coro_cctx *)arg);
933 991
934 /* somebody or something will hit me for both perl_run and PL_restartop */ 992 /* somebody or something will hit me for both perl_run and PL_restartop */
935 PL_restartop = PL_op; 993 PL_restartop = PL_op;
936 perl_run (PL_curinterp); 994 perl_run (PL_curinterp);
937 995
… …
956 ++cctx_count; 1014 ++cctx_count;
957 1015
958 Newz (0, cctx, 1, coro_cctx); 1016 Newz (0, cctx, 1, coro_cctx);
959 1017
960#if HAVE_MMAP 1018#if HAVE_MMAP
961
962 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1019 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
963 /* mmap supposedly does allocate-on-write for us */ 1020 /* mmap supposedly does allocate-on-write for us */
964 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1021 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
965 1022
966 if (cctx->sptr != (void *)-1) 1023 if (cctx->sptr != (void *)-1)
… …
987 stack_start = cctx->sptr; 1044 stack_start = cctx->sptr;
988 stack_size = cctx->ssize; 1045 stack_size = cctx->ssize;
989 } 1046 }
990 1047
991 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1048 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
992 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1049 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
993 1050
994 return cctx; 1051 return cctx;
995} 1052}
996 1053
997static void 1054static void
… …
1071 if (expect_false (next->flags & CF_DESTROYED)) 1128 if (expect_false (next->flags & CF_DESTROYED))
1072 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1129 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1073 1130
1074 if ( 1131 if (
1075#if PERL_VERSION_ATLEAST (5,9,0) 1132#if PERL_VERSION_ATLEAST (5,9,0)
1076 expect_false (PL_parser) 1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1077#else 1134#else
1078 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1079#endif 1136#endif
1080 ) 1137 )
1081 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1138 croak ("Coro::State::transfer called while parsing, but this is not supported");
… …
1085/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1086static void NOINLINE 1143static void NOINLINE
1087transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
1088{ 1145{
1089 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1090 1148
1091 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1092 if (expect_false (!next)) 1150 if (expect_false (!next))
1093 { 1151 {
1094 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1109 prev->flags &= ~CF_RUNNING; 1167 prev->flags &= ~CF_RUNNING;
1110 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
1111 1169
1112 LOCK; 1170 LOCK;
1113 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
1114 if (expect_false (next->flags & CF_NEW)) 1175 if (expect_false (next->flags & CF_NEW))
1115 { 1176 {
1116 /* need to start coroutine */ 1177 /* need to start coroutine */
1117 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
1118 /* first get rid of the old state */
1119 save_perl (aTHX_ prev);
1120 /* setup coroutine call */ 1179 /* setup coroutine call */
1121 coro_setup (aTHX_ next); 1180 coro_setup (aTHX_ next);
1122 } 1181 }
1123 else 1182 else
1124 {
1125 /* coroutine already started */
1126 save_perl (aTHX_ prev);
1127 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1128 }
1129 1184
1130 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1131 1186
1132 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1133 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1188 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
… …
1138 prev->cctx = 0; 1193 prev->cctx = 0;
1139 1194
1140 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1195 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1141 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1196 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1142 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1197 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1198 if (!next->cctx)
1143 next->cctx = cctx_get (aTHX); 1199 next->cctx = cctx_get (aTHX);
1144 1200
1145 cctx_put (prev__cctx); 1201 cctx_put (prev__cctx);
1146 } 1202 }
1147 1203
1148 ++next->usecount; 1204 ++next->usecount;
1149 1205
1150 if (expect_true (!next->cctx)) 1206 if (expect_true (!next->cctx))
1151 next->cctx = cctx_get (aTHX); 1207 next->cctx = cctx_get (aTHX);
1208
1209 has_throw = !!next->throw;
1152 1210
1153 if (expect_false (prev__cctx != next->cctx)) 1211 if (expect_false (prev__cctx != next->cctx))
1154 { 1212 {
1155 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1156 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
… …
1158 } 1216 }
1159 1217
1160 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1161 UNLOCK; 1219 UNLOCK;
1162 1220
1163 if (expect_false (prev->throw || next->throw)) 1221 if (expect_false (has_throw))
1164 { 1222 {
1165 struct coro *coro = SvSTATE (coro_current); 1223 struct coro *coro = SvSTATE (coro_current);
1166 1224
1167 if (coro->throw) 1225 if (coro->throw)
1168 { 1226 {
… …
1294{ 1352{
1295 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1353 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1296} 1354}
1297 1355
1298static SV * 1356static SV *
1299coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1300{ 1358{
1301 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1302 1360
1303 min_prio -= PRIO_MIN;
1304 if (min_prio < 0)
1305 min_prio = 0;
1306
1307 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1308 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1309 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1310 1364
1311 return 0; 1365 return 0;
1312} 1366}
… …
1348 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1349 1403
1350 for (;;) 1404 for (;;)
1351 { 1405 {
1352 LOCK; 1406 LOCK;
1353 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1354 1408
1355 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1356 if (expect_false (!next_sv)) 1410 if (expect_false (!next_sv))
1357 { 1411 {
1358 dSP; 1412 dSP;
… …
1362 SAVETMPS; 1416 SAVETMPS;
1363 1417
1364 PUSHMARK (SP); 1418 PUSHMARK (SP);
1365 PUTBACK; 1419 PUTBACK;
1366 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1367 1422
1368 FREETMPS; 1423 FREETMPS;
1369 LEAVE; 1424 LEAVE;
1370 continue; 1425 continue;
1371 } 1426 }
… …
1501 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1502 1557
1503 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1504 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1505 1560
1561 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1562 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1563 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1564 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1565
1506 hv_sig = coro_get_hv ("SIG", TRUE); 1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1507 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1567 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1508 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1568 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1509
1510 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1511 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1512 1569
1513 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1514 1571
1515 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1516 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1522 1579
1523 while (main_top_env->je_prev) 1580 while (main_top_env->je_prev)
1524 main_top_env = main_top_env->je_prev; 1581 main_top_env = main_top_env->je_prev;
1525 1582
1526 coroapi.ver = CORO_API_VERSION; 1583 coroapi.ver = CORO_API_VERSION;
1584 coroapi.rev = CORO_API_REVISION;
1527 coroapi.transfer = api_transfer; 1585 coroapi.transfer = api_transfer;
1528 1586
1529 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1587 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1530} 1588}
1531 1589
1532SV * 1590SV *
1533new (char *klass, ...) 1591new (char *klass, ...)
1534 CODE: 1592 CODE:
1535{ 1593{
1536 struct coro *coro; 1594 struct coro *coro;
1595 MAGIC *mg;
1537 HV *hv; 1596 HV *hv;
1538 int i; 1597 int i;
1539 1598
1540 Newz (0, coro, 1, struct coro); 1599 Newz (0, coro, 1, struct coro);
1541 coro->args = newAV (); 1600 coro->args = newAV ();
… …
1544 if (coro_first) coro_first->prev = coro; 1603 if (coro_first) coro_first->prev = coro;
1545 coro->next = coro_first; 1604 coro->next = coro_first;
1546 coro_first = coro; 1605 coro_first = coro;
1547 1606
1548 coro->hv = hv = newHV (); 1607 coro->hv = hv = newHV ();
1549 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1608 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1609 mg->mg_flags |= MGf_DUP;
1550 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1610 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1551 1611
1552 av_extend (coro->args, items - 1); 1612 av_extend (coro->args, items - 1);
1553 for (i = 1; i < items; i++) 1613 for (i = 1; i < items; i++)
1554 av_push (coro->args, newSVsv (ST (i))); 1614 av_push (coro->args, newSVsv (ST (i)));
… …
1568 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1569 CODE: 1629 CODE:
1570{ 1630{
1571 struct transfer_args ta; 1631 struct transfer_args ta;
1572 1632
1633 PUTBACK;
1573 switch (ix) 1634 switch (ix)
1574 { 1635 {
1575 case 0: 1636 case 0:
1576 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1577 ta.next = 0; 1638 ta.next = 0;
… …
1596 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1597 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1598 1659
1599 break; 1660 break;
1600 } 1661 }
1662 SPAGAIN;
1601 1663
1602 BARRIER; 1664 BARRIER;
1665 PUTBACK;
1603 TRANSFER (ta); 1666 TRANSFER (ta);
1604 1667 SPAGAIN; /* might be the sp of a different coroutine now */
1605 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1668 /* be extra careful not to ever do anything after TRANSFER */
1606 XSRETURN_YES;
1607} 1669}
1608 1670
1609bool 1671bool
1610_destroy (SV *coro_sv) 1672_destroy (SV *coro_sv)
1611 CODE: 1673 CODE:
… …
1663 { 1725 {
1664 struct coro temp; 1726 struct coro temp;
1665 1727
1666 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1667 { 1729 {
1730 PUTBACK;
1668 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1669 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1670 } 1733 }
1671 1734
1672 { 1735 {
1673 dSP; 1736 dSP;
1674 ENTER; 1737 ENTER;
1675 SAVETMPS; 1738 SAVETMPS;
1739 PUTBACK;
1740 PUSHSTACK;
1676 PUSHMARK (SP); 1741 PUSHMARK (SP);
1677 PUTBACK;
1678 1742
1679 if (ix) 1743 if (ix)
1680 eval_sv (coderef, 0); 1744 eval_sv (coderef, 0);
1681 else 1745 else
1682 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1746 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1683 1747
1748 POPSTACK;
1684 SPAGAIN; 1749 SPAGAIN;
1685 FREETMPS; 1750 FREETMPS;
1686 LEAVE; 1751 LEAVE;
1687 PUTBACK; 1752 PUTBACK;
1688 } 1753 }
1689 1754
1690 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1691 { 1756 {
1692 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1693 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1694 } 1760 }
1695 } 1761 }
1696} 1762}
1697 1763
1698SV * 1764SV *
… …
1746 1812
1747BOOT: 1813BOOT:
1748{ 1814{
1749 int i; 1815 int i;
1750 1816
1751 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1817 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1752 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1818 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1753 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1754 1820
1755 coro_current = coro_get_sv ("Coro::current", FALSE); 1821 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1756 SvREADONLY_on (coro_current); 1822 SvREADONLY_on (coro_current);
1757 1823
1758 coro_stash = gv_stashpv ("Coro", TRUE); 1824 coro_stash = gv_stashpv ("Coro", TRUE);
1759 1825
1760 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1843 CODE: 1909 CODE:
1844{ 1910{
1845 struct coro *coro = SvSTATE (coro_current); 1911 struct coro *coro = SvSTATE (coro_current);
1846 HV *hv = (HV *)SvRV (coro_current); 1912 HV *hv = (HV *)SvRV (coro_current);
1847 AV *defav = GvAV (PL_defgv); 1913 AV *defav = GvAV (PL_defgv);
1848 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1914 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1849 AV *invoke_av; 1915 AV *invoke_av;
1850 int i, len; 1916 int i, len;
1851 1917
1852 if (!invoke) 1918 if (!invoke)
1919 {
1920 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1853 croak ("\3async_pool terminate\2\n"); 1921 croak ("\3async_pool terminate\2\n");
1922 }
1854 1923
1855 SvREFCNT_dec (coro->saved_deffh); 1924 SvREFCNT_dec (coro->saved_deffh);
1856 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1857 1926
1858 hv_store (hv, "desc", sizeof ("desc") - 1, 1927 hv_store (hv, "desc", sizeof ("desc") - 1,
1859 newSVpvn (strpair ("[async_pool]")), 0); 1928 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1860 1929
1861 invoke_av = (AV *)SvRV (invoke); 1930 invoke_av = (AV *)SvRV (invoke);
1862 len = av_len (invoke_av); 1931 len = av_len (invoke_av);
1863 1932
1864 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1933 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1884 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1953 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1885 coro->saved_deffh = 0; 1954 coro->saved_deffh = 0;
1886 1955
1887 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1888 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1957 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1958 {
1959 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1889 croak ("\3async_pool terminate\2\n"); 1960 croak ("\3async_pool terminate\2\n");
1961 }
1890 1962
1891 av_clear (GvAV (PL_defgv)); 1963 av_clear (GvAV (PL_defgv));
1892 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1964 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1893 newSVpvn (strpair ("[async_pool idle]")), 0); 1965 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1894 1966
1895 coro->prio = 0; 1967 coro->prio = 0;
1896 1968
1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1969 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1898 api_trace (coro_current, 0); 1970 api_trace (coro_current, 0);

Diff Legend

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