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.204 by root, Mon Oct 8 03:03:39 2007 UTC vs.
Revision 1.229 by root, Thu Apr 10 07:45:33 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;
… …
261static struct coro *coro_first; 264static struct coro *coro_first;
262 265
263/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
264 267
265static SV * 268static SV *
266coro_get_sv (const char *name, int create) 269coro_get_sv (pTHX_ const char *name, int create)
267{ 270{
268#if PERL_VERSION_ATLEAST (5,9,0) 271#if PERL_VERSION_ATLEAST (5,10,0)
269 /* 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 */
270 get_sv (name, create); 273 get_sv (name, create);
271#endif 274#endif
272 return get_sv (name, create); 275 return get_sv (name, create);
273} 276}
274 277
275static AV * 278static AV *
276coro_get_av (const char *name, int create) 279coro_get_av (pTHX_ const char *name, int create)
277{ 280{
278#if PERL_VERSION_ATLEAST (5,9,0) 281#if PERL_VERSION_ATLEAST (5,10,0)
279 /* 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 */
280 get_av (name, create); 283 get_av (name, create);
281#endif 284#endif
282 return get_av (name, create); 285 return get_av (name, create);
283} 286}
284 287
285static HV * 288static HV *
286coro_get_hv (const char *name, int create) 289coro_get_hv (pTHX_ const char *name, int create)
287{ 290{
288#if PERL_VERSION_ATLEAST (5,9,0) 291#if PERL_VERSION_ATLEAST (5,10,0)
289 /* 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 */
290 get_hv (name, create); 293 get_hv (name, create);
291#endif 294#endif
292 return get_hv (name, create); 295 return get_hv (name, create);
293} 296}
… …
298 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
299 AV *newpadlist, *newpad; 302 AV *newpadlist, *newpad;
300 303
301 newpadlist = newAV (); 304 newpadlist = newAV ();
302 AvREAL_off (newpadlist); 305 AvREAL_off (newpadlist);
303#if PERL_VERSION_ATLEAST (5,9,0) 306#if PERL_VERSION_ATLEAST (5,10,0)
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
305#else 308#else
306 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 309 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
307#endif 310#endif
308 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 311 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
… …
346 349
347 /* casting is fun. */ 350 /* casting is fun. */
348 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
349 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
350 353
351 SvREFCNT_dec (av);
352
353 return 0; 354 return 0;
354} 355}
355 356
356#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
357 359
358static 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};
359 364
360#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
361 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
362 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
363 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
364 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
365 : 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)
366 374
367static struct coro * 375static struct coro *
368SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
369{ 377{
370 HV *stash; 378 HV *stash;
… …
382 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
383 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
384 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
385 } 393 }
386 394
387 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
388 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
389} 397}
390 398
391#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
392 400
393/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
394static void 402static void
395get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
396{ 404{
397 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
398 AV *av; 406 AV *av;
399 407
400 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
401 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
402 else 410 else
… …
414} 422}
415 423
416static void 424static void
417put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
418{ 426{
419 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
420 AV *av; 428 AV *av;
421 429
422 if (expect_false (!mg)) 430 if (expect_false (!mg))
423 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
424 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
425 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
426 mg->mg_virtual = &vtbl_coro;
427 mg->mg_obj = (SV *)newAV ();
428 }
429 432
430 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
431 434
432 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
433 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
… …
451 GvSV (irsgv) = slot->irsgv; 454 GvSV (irsgv) = slot->irsgv;
452 455
453 #define VAR(name,type) PL_ ## name = slot->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
454 # include "state.h" 457 # include "state.h"
455 #undef VAR 458 #undef VAR
456
457 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
458 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
459 459
460 { 460 {
461 dSP; 461 dSP;
462 462
463 CV *cv; 463 CV *cv;
… …
592 592
593 New(54,PL_savestack,24,ANY); 593 New(54,PL_savestack,24,ANY);
594 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
595 PL_savestack_max = 24; 595 PL_savestack_max = 24;
596 596
597#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,10,0)
598 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
599 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
600 PL_retstack_max = 4; 600 PL_retstack_max = 4;
601#endif 601#endif
602} 602}
… …
625 625
626 Safefree (PL_tmps_stack); 626 Safefree (PL_tmps_stack);
627 Safefree (PL_markstack); 627 Safefree (PL_markstack);
628 Safefree (PL_scopestack); 628 Safefree (PL_scopestack);
629 Safefree (PL_savestack); 629 Safefree (PL_savestack);
630#if !PERL_VERSION_ATLEAST (5,9,0) 630#if !PERL_VERSION_ATLEAST (5,10,0)
631 Safefree (PL_retstack); 631 Safefree (PL_retstack);
632#endif 632#endif
633} 633}
634 634
635static size_t 635static size_t
… …
659 rss += slot->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
661 rss += slot->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
662 rss += slot->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
663 663
664#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,10,0)
665 rss += slot->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
666#endif 666#endif
667 } 667 }
668 668
669 return rss; 669 return rss;
670} 670}
671 671
672/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
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}
673 723
674static void 724static void
675coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
676{ 726{
677 /* 727 /*
… …
686 PL_curpm = 0; 736 PL_curpm = 0;
687 PL_curpad = 0; 737 PL_curpad = 0;
688 PL_localizing = 0; 738 PL_localizing = 0;
689 PL_dirty = 0; 739 PL_dirty = 0;
690 PL_restartop = 0; 740 PL_restartop = 0;
691 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 741#if PERL_VERSION_ATLEAST (5,10,0)
692 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 742 PL_parser = 0;
743#endif
744
745 /* recreate the die/warn hooks */
746 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
747 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
693 748
694 GvSV (PL_defgv) = newSV (0); 749 GvSV (PL_defgv) = newSV (0);
695 GvAV (PL_defgv) = coro->args; coro->args = 0; 750 GvAV (PL_defgv) = coro->args; coro->args = 0;
696 GvSV (PL_errgv) = newSV (0); 751 GvSV (PL_errgv) = newSV (0);
697 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 752 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
712 PL_op = (OP *)&myop; 767 PL_op = (OP *)&myop;
713 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 768 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
714 SPAGAIN; 769 SPAGAIN;
715 } 770 }
716 771
717 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 772 /* this newly created coroutine might be run on an existing cctx which most
773 * likely was suspended in set_stacklevel, called from entersub.
774 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
775 * so we ENTER here for symmetry
776 */
777 ENTER;
718} 778}
719 779
720static void 780static void
721coro_destroy (pTHX_ struct coro *coro) 781coro_destroy (pTHX_ struct coro *coro)
722{ 782{
… …
806 PUSHMARK (SP); 866 PUSHMARK (SP);
807 PUSHs (&PL_sv_no); 867 PUSHs (&PL_sv_no);
808 PUSHs (fullname); 868 PUSHs (fullname);
809 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 869 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
810 PUTBACK; 870 PUTBACK;
811 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 871 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
812 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 872 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
813 SPAGAIN; 873 SPAGAIN;
814 FREETMPS; 874 FREETMPS;
815 LEAVE; 875 LEAVE;
816 PL_runops = runops_trace; 876 PL_runops = runops_trace;
… …
843 SAVETMPS; 903 SAVETMPS;
844 EXTEND (SP, 3); 904 EXTEND (SP, 3);
845 PUSHMARK (SP); 905 PUSHMARK (SP);
846 PUSHs (&PL_sv_yes); 906 PUSHs (&PL_sv_yes);
847 PUSHs (fullname); 907 PUSHs (fullname);
848 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 908 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
849 PUTBACK; 909 PUTBACK;
850 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 910 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
851 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 911 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
852 SPAGAIN; 912 SPAGAIN;
853 FREETMPS; 913 FREETMPS;
854 LEAVE; 914 LEAVE;
855 PL_runops = runops_trace; 915 PL_runops = runops_trace;
… …
869 PL_runops = RUNOPS_DEFAULT; 929 PL_runops = RUNOPS_DEFAULT;
870 PUSHMARK (SP); 930 PUSHMARK (SP);
871 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 931 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
872 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 932 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
873 PUTBACK; 933 PUTBACK;
874 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 934 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
875 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 935 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
876 SPAGAIN; 936 SPAGAIN;
877 FREETMPS; 937 FREETMPS;
878 LEAVE; 938 LEAVE;
879 PL_runops = runops_trace; 939 PL_runops = runops_trace;
… …
1069 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1129 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1070 1130
1071 if (expect_false (next->flags & CF_DESTROYED)) 1131 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"); 1132 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1073 1133
1074 if (
1075#if PERL_VERSION_ATLEAST (5,9,0) 1134#if !PERL_VERSION_ATLEAST (5,10,0)
1076 expect_false (PL_parser)
1077#else
1078 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 if (expect_false (PL_lex_state != LEX_NOTPARSING)
1079#endif
1080 )
1081 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1136 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1137#endif
1082 } 1138 }
1083} 1139}
1084 1140
1085/* always use the TRANSFER macro */ 1141/* always use the TRANSFER macro */
1086static void NOINLINE 1142static void NOINLINE
1087transfer (pTHX_ struct coro *prev, struct coro *next) 1143transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1088{ 1144{
1089 dSTACKLEVEL; 1145 dSTACKLEVEL;
1146 static volatile int has_throw;
1090 1147
1091 /* sometimes transfer is only called to set idle_sp */ 1148 /* sometimes transfer is only called to set idle_sp */
1092 if (expect_false (!next)) 1149 if (expect_false (!next))
1093 { 1150 {
1094 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1151 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1109 prev->flags &= ~CF_RUNNING; 1166 prev->flags &= ~CF_RUNNING;
1110 next->flags |= CF_RUNNING; 1167 next->flags |= CF_RUNNING;
1111 1168
1112 LOCK; 1169 LOCK;
1113 1170
1171 /* first get rid of the old state */
1172 save_perl (aTHX_ prev);
1173
1114 if (expect_false (next->flags & CF_NEW)) 1174 if (expect_false (next->flags & CF_NEW))
1115 { 1175 {
1116 /* need to start coroutine */ 1176 /* need to start coroutine */
1117 next->flags &= ~CF_NEW; 1177 next->flags &= ~CF_NEW;
1118 /* first get rid of the old state */
1119 save_perl (aTHX_ prev);
1120 /* setup coroutine call */ 1178 /* setup coroutine call */
1121 coro_setup (aTHX_ next); 1179 coro_setup (aTHX_ next);
1122 } 1180 }
1123 else 1181 else
1124 {
1125 /* coroutine already started */
1126 save_perl (aTHX_ prev);
1127 load_perl (aTHX_ next); 1182 load_perl (aTHX_ next);
1128 }
1129 1183
1130 prev__cctx = prev->cctx; 1184 prev__cctx = prev->cctx;
1131 1185
1132 /* possibly "free" the cctx */ 1186 /* possibly "free" the cctx */
1133 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1187 if (expect_true (
1188 prev__cctx->idle_sp == STACKLEVEL
1189 && !(prev__cctx->flags & CC_TRACE)
1190 && !force_cctx
1191 ))
1134 { 1192 {
1135 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1193 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1136 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1194 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1137 1195
1138 prev->cctx = 0; 1196 prev->cctx = 0;
… …
1148 1206
1149 ++next->usecount; 1207 ++next->usecount;
1150 1208
1151 if (expect_true (!next->cctx)) 1209 if (expect_true (!next->cctx))
1152 next->cctx = cctx_get (aTHX); 1210 next->cctx = cctx_get (aTHX);
1211
1212 has_throw = !!next->throw;
1153 1213
1154 if (expect_false (prev__cctx != next->cctx)) 1214 if (expect_false (prev__cctx != next->cctx))
1155 { 1215 {
1156 prev__cctx->top_env = PL_top_env; 1216 prev__cctx->top_env = PL_top_env;
1157 PL_top_env = next->cctx->top_env; 1217 PL_top_env = next->cctx->top_env;
… …
1159 } 1219 }
1160 1220
1161 free_coro_mortal (aTHX); 1221 free_coro_mortal (aTHX);
1162 UNLOCK; 1222 UNLOCK;
1163 1223
1164 if (expect_false (prev->throw || next->throw)) 1224 if (expect_false (has_throw))
1165 { 1225 {
1166 struct coro *coro = SvSTATE (coro_current); 1226 struct coro *coro = SvSTATE (coro_current);
1167 1227
1168 if (coro->throw) 1228 if (coro->throw)
1169 { 1229 {
… …
1179struct transfer_args 1239struct transfer_args
1180{ 1240{
1181 struct coro *prev, *next; 1241 struct coro *prev, *next;
1182}; 1242};
1183 1243
1184#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1244#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1185#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1245#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1186 1246
1187/** high level stuff ********************************************************/ 1247/** high level stuff ********************************************************/
1188 1248
1189static int 1249static int
… …
1283{ 1343{
1284 dTHX; 1344 dTHX;
1285 struct transfer_args ta; 1345 struct transfer_args ta;
1286 1346
1287 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1347 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1288 TRANSFER (ta); 1348 TRANSFER (ta, 1);
1289} 1349}
1290 1350
1291/** Coro ********************************************************************/ 1351/** Coro ********************************************************************/
1292 1352
1293static void 1353static void
… …
1295{ 1355{
1296 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1356 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1297} 1357}
1298 1358
1299static SV * 1359static SV *
1300coro_deq (pTHX_ int min_prio) 1360coro_deq (pTHX)
1301{ 1361{
1302 int prio = PRIO_MAX - PRIO_MIN; 1362 int prio;
1303 1363
1304 min_prio -= PRIO_MIN;
1305 if (min_prio < 0)
1306 min_prio = 0;
1307
1308 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1364 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1309 if (AvFILLp (coro_ready [prio]) >= 0) 1365 if (AvFILLp (coro_ready [prio]) >= 0)
1310 return av_shift (coro_ready [prio]); 1366 return av_shift (coro_ready [prio]);
1311 1367
1312 return 0; 1368 return 0;
1313} 1369}
… …
1349 SV *prev_sv, *next_sv; 1405 SV *prev_sv, *next_sv;
1350 1406
1351 for (;;) 1407 for (;;)
1352 { 1408 {
1353 LOCK; 1409 LOCK;
1354 next_sv = coro_deq (aTHX_ PRIO_MIN); 1410 next_sv = coro_deq (aTHX);
1355 1411
1356 /* nothing to schedule: call the idle handler */ 1412 /* nothing to schedule: call the idle handler */
1357 if (expect_false (!next_sv)) 1413 if (expect_false (!next_sv))
1358 { 1414 {
1359 dSP; 1415 dSP;
… …
1363 SAVETMPS; 1419 SAVETMPS;
1364 1420
1365 PUSHMARK (SP); 1421 PUSHMARK (SP);
1366 PUTBACK; 1422 PUTBACK;
1367 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1423 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1424 SPAGAIN;
1368 1425
1369 FREETMPS; 1426 FREETMPS;
1370 LEAVE; 1427 LEAVE;
1371 continue; 1428 continue;
1372 } 1429 }
… …
1427{ 1484{
1428 dTHX; 1485 dTHX;
1429 struct transfer_args ta; 1486 struct transfer_args ta;
1430 1487
1431 prepare_schedule (aTHX_ &ta); 1488 prepare_schedule (aTHX_ &ta);
1432 TRANSFER (ta); 1489 TRANSFER (ta, 1);
1433} 1490}
1434 1491
1435static int 1492static int
1436api_cede (void) 1493api_cede (void)
1437{ 1494{
… …
1440 1497
1441 prepare_cede (aTHX_ &ta); 1498 prepare_cede (aTHX_ &ta);
1442 1499
1443 if (expect_true (ta.prev != ta.next)) 1500 if (expect_true (ta.prev != ta.next))
1444 { 1501 {
1445 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1446 return 1; 1503 return 1;
1447 } 1504 }
1448 else 1505 else
1449 return 0; 1506 return 0;
1450} 1507}
… …
1455 dTHX; 1512 dTHX;
1456 struct transfer_args ta; 1513 struct transfer_args ta;
1457 1514
1458 if (prepare_cede_notself (aTHX_ &ta)) 1515 if (prepare_cede_notself (aTHX_ &ta))
1459 { 1516 {
1460 TRANSFER (ta); 1517 TRANSFER (ta, 1);
1461 return 1; 1518 return 1;
1462 } 1519 }
1463 else 1520 else
1464 return 0; 1521 return 0;
1465} 1522}
… …
1502 BOOT_PAGESIZE; 1559 BOOT_PAGESIZE;
1503 1560
1504 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1561 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1505 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1562 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1506 1563
1564 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1565 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1566 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1567 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1568
1507 hv_sig = coro_get_hv ("SIG", TRUE); 1569 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1508 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1570 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1509 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1571 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1510
1511 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1512 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1513 1572
1514 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1573 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1515 1574
1516 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1575 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1517 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1576 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1523 1582
1524 while (main_top_env->je_prev) 1583 while (main_top_env->je_prev)
1525 main_top_env = main_top_env->je_prev; 1584 main_top_env = main_top_env->je_prev;
1526 1585
1527 coroapi.ver = CORO_API_VERSION; 1586 coroapi.ver = CORO_API_VERSION;
1587 coroapi.rev = CORO_API_REVISION;
1528 coroapi.transfer = api_transfer; 1588 coroapi.transfer = api_transfer;
1529 1589
1530 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1590 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1531} 1591}
1532 1592
1533SV * 1593SV *
1534new (char *klass, ...) 1594new (char *klass, ...)
1535 CODE: 1595 CODE:
1536{ 1596{
1537 struct coro *coro; 1597 struct coro *coro;
1598 MAGIC *mg;
1538 HV *hv; 1599 HV *hv;
1539 int i; 1600 int i;
1540 1601
1541 Newz (0, coro, 1, struct coro); 1602 Newz (0, coro, 1, struct coro);
1542 coro->args = newAV (); 1603 coro->args = newAV ();
… …
1545 if (coro_first) coro_first->prev = coro; 1606 if (coro_first) coro_first->prev = coro;
1546 coro->next = coro_first; 1607 coro->next = coro_first;
1547 coro_first = coro; 1608 coro_first = coro;
1548 1609
1549 coro->hv = hv = newHV (); 1610 coro->hv = hv = newHV ();
1550 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1611 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1612 mg->mg_flags |= MGf_DUP;
1551 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1613 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1552 1614
1553 av_extend (coro->args, items - 1); 1615 av_extend (coro->args, items - 1);
1554 for (i = 1; i < items; i++) 1616 for (i = 1; i < items; i++)
1555 av_push (coro->args, newSVsv (ST (i))); 1617 av_push (coro->args, newSVsv (ST (i)));
… …
1569 Coro::cede_notself = 4 1631 Coro::cede_notself = 4
1570 CODE: 1632 CODE:
1571{ 1633{
1572 struct transfer_args ta; 1634 struct transfer_args ta;
1573 1635
1636 PUTBACK;
1574 switch (ix) 1637 switch (ix)
1575 { 1638 {
1576 case 0: 1639 case 0:
1577 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1640 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1578 ta.next = 0; 1641 ta.next = 0;
… …
1597 if (!prepare_cede_notself (aTHX_ &ta)) 1660 if (!prepare_cede_notself (aTHX_ &ta))
1598 XSRETURN_EMPTY; 1661 XSRETURN_EMPTY;
1599 1662
1600 break; 1663 break;
1601 } 1664 }
1665 SPAGAIN;
1602 1666
1603 BARRIER; 1667 BARRIER;
1668 PUTBACK;
1604 TRANSFER (ta); 1669 TRANSFER (ta, 0);
1605 1670 SPAGAIN; /* might be the sp of a different coroutine now */
1606 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1671 /* be extra careful not to ever do anything after TRANSFER */
1607 XSRETURN_YES;
1608} 1672}
1609 1673
1610bool 1674bool
1611_destroy (SV *coro_sv) 1675_destroy (SV *coro_sv)
1612 CODE: 1676 CODE:
… …
1664 { 1728 {
1665 struct coro temp; 1729 struct coro temp;
1666 1730
1667 if (!(coro->flags & CF_RUNNING)) 1731 if (!(coro->flags & CF_RUNNING))
1668 { 1732 {
1733 PUTBACK;
1669 save_perl (aTHX_ &temp); 1734 save_perl (aTHX_ &temp);
1670 load_perl (aTHX_ coro); 1735 load_perl (aTHX_ coro);
1671 } 1736 }
1672 1737
1673 { 1738 {
1674 dSP; 1739 dSP;
1675 ENTER; 1740 ENTER;
1676 SAVETMPS; 1741 SAVETMPS;
1742 PUTBACK;
1743 PUSHSTACK;
1677 PUSHMARK (SP); 1744 PUSHMARK (SP);
1678 PUTBACK;
1679 1745
1680 if (ix) 1746 if (ix)
1681 eval_sv (coderef, 0); 1747 eval_sv (coderef, 0);
1682 else 1748 else
1683 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1749 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1684 1750
1751 POPSTACK;
1685 SPAGAIN; 1752 SPAGAIN;
1686 FREETMPS; 1753 FREETMPS;
1687 LEAVE; 1754 LEAVE;
1688 PUTBACK; 1755 PUTBACK;
1689 } 1756 }
1690 1757
1691 if (!(coro->flags & CF_RUNNING)) 1758 if (!(coro->flags & CF_RUNNING))
1692 { 1759 {
1693 save_perl (aTHX_ coro); 1760 save_perl (aTHX_ coro);
1694 load_perl (aTHX_ &temp); 1761 load_perl (aTHX_ &temp);
1762 SPAGAIN;
1695 } 1763 }
1696 } 1764 }
1697} 1765}
1698 1766
1699SV * 1767SV *
… …
1740 case 1: RETVAL = coro->usecount; break; 1808 case 1: RETVAL = coro->usecount; break;
1741 } 1809 }
1742 OUTPUT: 1810 OUTPUT:
1743 RETVAL 1811 RETVAL
1744 1812
1813void
1814force_cctx ()
1815 CODE:
1816 struct coro *coro = SvSTATE (coro_current);
1817 coro->cctx->idle_sp = 0;
1745 1818
1746MODULE = Coro::State PACKAGE = Coro 1819MODULE = Coro::State PACKAGE = Coro
1747 1820
1748BOOT: 1821BOOT:
1749{ 1822{
1750 int i; 1823 int i;
1751 1824
1752 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1825 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1753 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1826 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1754 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1827 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1755 1828
1756 coro_current = coro_get_sv ("Coro::current", FALSE); 1829 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1757 SvREADONLY_on (coro_current); 1830 SvREADONLY_on (coro_current);
1758 1831
1759 coro_stash = gv_stashpv ("Coro", TRUE); 1832 coro_stash = gv_stashpv ("Coro", TRUE);
1760 1833
1761 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1834 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1836 PROTOTYPE: $;$ 1909 PROTOTYPE: $;$
1837 CODE: 1910 CODE:
1838 SvREFCNT_dec (self->throw); 1911 SvREFCNT_dec (self->throw);
1839 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1912 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1840 1913
1914void
1915swap_defsv (Coro::State self)
1916 PROTOTYPE: $
1917 ALIAS:
1918 swap_defav = 1
1919 CODE:
1920 if (!self->slot)
1921 croak ("cannot swap state with coroutine that has no saved state");
1922 else
1923 {
1924 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1925 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1926
1927 SV *tmp = *src; *src = *dst; *dst = tmp;
1928 }
1929
1841# for async_pool speedup 1930# for async_pool speedup
1842void 1931void
1843_pool_1 (SV *cb) 1932_pool_1 (SV *cb)
1844 CODE: 1933 CODE:
1845{ 1934{
1846 struct coro *coro = SvSTATE (coro_current); 1935 struct coro *coro = SvSTATE (coro_current);
1847 HV *hv = (HV *)SvRV (coro_current); 1936 HV *hv = (HV *)SvRV (coro_current);
1848 AV *defav = GvAV (PL_defgv); 1937 AV *defav = GvAV (PL_defgv);
1849 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1938 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1850 AV *invoke_av; 1939 AV *invoke_av;
1851 int i, len; 1940 int i, len;
1852 1941
1853 if (!invoke) 1942 if (!invoke)
1943 {
1944 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1854 croak ("\3async_pool terminate\2\n"); 1945 croak ("\3async_pool terminate\2\n");
1946 }
1855 1947
1856 SvREFCNT_dec (coro->saved_deffh); 1948 SvREFCNT_dec (coro->saved_deffh);
1857 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1949 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1858 1950
1859 hv_store (hv, "desc", sizeof ("desc") - 1, 1951 hv_store (hv, "desc", sizeof ("desc") - 1,
1860 newSVpvn (strpair ("[async_pool]")), 0); 1952 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1861 1953
1862 invoke_av = (AV *)SvRV (invoke); 1954 invoke_av = (AV *)SvRV (invoke);
1863 len = av_len (invoke_av); 1955 len = av_len (invoke_av);
1864 1956
1865 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1957 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1885 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1977 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1886 coro->saved_deffh = 0; 1978 coro->saved_deffh = 0;
1887 1979
1888 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1980 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1889 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1981 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1982 {
1983 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1890 croak ("\3async_pool terminate\2\n"); 1984 croak ("\3async_pool terminate\2\n");
1985 }
1891 1986
1892 av_clear (GvAV (PL_defgv)); 1987 av_clear (GvAV (PL_defgv));
1893 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1988 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1894 newSVpvn (strpair ("[async_pool idle]")), 0); 1989 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1895 1990
1896 coro->prio = 0; 1991 coro->prio = 0;
1897 1992
1898 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1993 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1899 api_trace (coro_current, 0); 1994 api_trace (coro_current, 0);

Diff Legend

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