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.211 by root, Wed Oct 10 03:37:58 2007 UTC vs.
Revision 1.232 by root, Thu Apr 24 12:40:38 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
16#ifdef WIN32
17# undef setjmp
18# undef longjmp
19# undef _exit
20# define setjmp _setjmp // deep magic, don't ask
21#else
15#include <inttypes.h> /* portable stdint.h */ 22# include <inttypes.h> /* most portable stdint.h */
23#endif
16 24
17#ifdef HAVE_MMAP 25#ifdef HAVE_MMAP
18# include <unistd.h> 26# include <unistd.h>
19# include <sys/mman.h> 27# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS 28# ifndef MAP_ANONYMOUS
72# ifndef IS_PADCONST 80# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 81# define IS_PADCONST(v) 0
74# endif 82# endif
75#endif 83#endif
76 84
85/* 5.8.8 */
86#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0
88#endif
89#ifndef newSV
90# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
77/* 5.8.7 */ 98/* 5.8.7 */
78#ifndef SvRV_set 99#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 100# define SvRV_set(s,v) SvRV(s) = (v)
80#endif
81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif 101#endif
89 102
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 103#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 104# undef CORO_STACKGUARD
92#endif 105#endif
131#else 144#else
132# define LOCK (void)0 145# define LOCK (void)0
133# define UNLOCK (void)0 146# define UNLOCK (void)0
134#endif 147#endif
135 148
136#define strpair(const) const, sizeof (const) - 1
137
138/* helper storage struct for Coro::AIO */ 149/* helper storage struct for Coro::AIO */
139struct io_state 150struct io_state
140{ 151{
141 int errorno; 152 int errorno;
142 I32 laststype; 153 I32 laststype;
147static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
148static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
149static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env; 161static JMPENV *main_top_env;
151static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
152static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
153 164
154static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
156 167static SV *rv_diehook;
168static SV *rv_warnhook;
157static HV *hv_sig; /* %SIG */ 169static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160 170
161/* async_pool helper stuff */ 171/* async_pool helper stuff */
162static SV *sv_pool_rss; 172static SV *sv_pool_rss;
163static SV *sv_pool_size; 173static SV *sv_pool_size;
164static AV *av_async_pool; 174static AV *av_async_pool;
262static struct coro *coro_first; 272static struct coro *coro_first;
263 273
264/** lowlevel stuff **********************************************************/ 274/** lowlevel stuff **********************************************************/
265 275
266static SV * 276static SV *
267coro_get_sv (const char *name, int create) 277coro_get_sv (pTHX_ const char *name, int create)
268{ 278{
269#if PERL_VERSION_ATLEAST (5,9,0) 279#if PERL_VERSION_ATLEAST (5,10,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create); 281 get_sv (name, create);
272#endif 282#endif
273 return get_sv (name, create); 283 return get_sv (name, create);
274} 284}
275 285
276static AV * 286static AV *
277coro_get_av (const char *name, int create) 287coro_get_av (pTHX_ const char *name, int create)
278{ 288{
279#if PERL_VERSION_ATLEAST (5,9,0) 289#if PERL_VERSION_ATLEAST (5,10,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create); 291 get_av (name, create);
282#endif 292#endif
283 return get_av (name, create); 293 return get_av (name, create);
284} 294}
285 295
286static HV * 296static HV *
287coro_get_hv (const char *name, int create) 297coro_get_hv (pTHX_ const char *name, int create)
288{ 298{
289#if PERL_VERSION_ATLEAST (5,9,0) 299#if PERL_VERSION_ATLEAST (5,10,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 300 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create); 301 get_hv (name, create);
292#endif 302#endif
293 return get_hv (name, create); 303 return get_hv (name, create);
294} 304}
299 AV *padlist = CvPADLIST (cv); 309 AV *padlist = CvPADLIST (cv);
300 AV *newpadlist, *newpad; 310 AV *newpadlist, *newpad;
301 311
302 newpadlist = newAV (); 312 newpadlist = newAV ();
303 AvREAL_off (newpadlist); 313 AvREAL_off (newpadlist);
304#if PERL_VERSION_ATLEAST (5,9,0) 314#if PERL_VERSION_ATLEAST (5,10,0)
305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 315 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
306#else 316#else
307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 317 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
308#endif 318#endif
309 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 319 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
347 357
348 /* casting is fun. */ 358 /* casting is fun. */
349 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 359 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
350 free_padlist (aTHX_ padlist); 360 free_padlist (aTHX_ padlist);
351 361
352 SvREFCNT_dec (av);
353
354 return 0; 362 return 0;
355} 363}
356 364
357#define PERL_MAGIC_coro PERL_MAGIC_ext 365#define CORO_MAGIC_type_cv PERL_MAGIC_ext
366#define CORO_MAGIC_type_state PERL_MAGIC_ext
358 367
359static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 368static MGVTBL coro_cv_vtbl = {
369 0, 0, 0, 0,
370 coro_cv_free
371};
360 372
361#define CORO_MAGIC(cv) \ 373#define CORO_MAGIC(sv,type) \
362 SvMAGIC (cv) \ 374 SvMAGIC (sv) \
363 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 375 ? SvMAGIC (sv)->mg_type == type \
364 ? SvMAGIC (cv) \ 376 ? SvMAGIC (sv) \
365 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 377 : mg_find (sv, type) \
366 : 0 378 : 0
379
380#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
381#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
367 382
368static struct coro * 383static struct coro *
369SvSTATE_ (pTHX_ SV *coro) 384SvSTATE_ (pTHX_ SV *coro)
370{ 385{
371 HV *stash; 386 HV *stash;
383 /* very slow, but rare, check */ 398 /* very slow, but rare, check */
384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 399 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
385 croak ("Coro::State object required"); 400 croak ("Coro::State object required");
386 } 401 }
387 402
388 mg = CORO_MAGIC (coro); 403 mg = CORO_MAGIC_state (coro);
389 return (struct coro *)mg->mg_ptr; 404 return (struct coro *)mg->mg_ptr;
390} 405}
391 406
392#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 407#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
393 408
394/* the next two functions merely cache the padlists */ 409/* the next two functions merely cache the padlists */
395static void 410static void
396get_padlist (pTHX_ CV *cv) 411get_padlist (pTHX_ CV *cv)
397{ 412{
398 MAGIC *mg = CORO_MAGIC (cv); 413 MAGIC *mg = CORO_MAGIC_cv (cv);
399 AV *av; 414 AV *av;
400 415
401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 416 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 417 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
403 else 418 else
415} 430}
416 431
417static void 432static void
418put_padlist (pTHX_ CV *cv) 433put_padlist (pTHX_ CV *cv)
419{ 434{
420 MAGIC *mg = CORO_MAGIC (cv); 435 MAGIC *mg = CORO_MAGIC_cv (cv);
421 AV *av; 436 AV *av;
422 437
423 if (expect_false (!mg)) 438 if (expect_false (!mg))
424 { 439 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 440
431 av = (AV *)mg->mg_obj; 441 av = (AV *)mg->mg_obj;
432 442
433 if (expect_false (AvFILLp (av) >= AvMAX (av))) 443 if (expect_false (AvFILLp (av) >= AvMAX (av)))
434 av_extend (av, AvMAX (av) + 1); 444 av_extend (av, AvMAX (av) + 1);
452 GvSV (irsgv) = slot->irsgv; 462 GvSV (irsgv) = slot->irsgv;
453 463
454 #define VAR(name,type) PL_ ## name = slot->name; 464 #define VAR(name,type) PL_ ## name = slot->name;
455 # include "state.h" 465 # include "state.h"
456 #undef VAR 466 #undef VAR
457
458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
460 467
461 { 468 {
462 dSP; 469 dSP;
463 470
464 CV *cv; 471 CV *cv;
593 600
594 New(54,PL_savestack,24,ANY); 601 New(54,PL_savestack,24,ANY);
595 PL_savestack_ix = 0; 602 PL_savestack_ix = 0;
596 PL_savestack_max = 24; 603 PL_savestack_max = 24;
597 604
598#if !PERL_VERSION_ATLEAST (5,9,0) 605#if !PERL_VERSION_ATLEAST (5,10,0)
599 New(54,PL_retstack,4,OP*); 606 New(54,PL_retstack,4,OP*);
600 PL_retstack_ix = 0; 607 PL_retstack_ix = 0;
601 PL_retstack_max = 4; 608 PL_retstack_max = 4;
602#endif 609#endif
603} 610}
626 633
627 Safefree (PL_tmps_stack); 634 Safefree (PL_tmps_stack);
628 Safefree (PL_markstack); 635 Safefree (PL_markstack);
629 Safefree (PL_scopestack); 636 Safefree (PL_scopestack);
630 Safefree (PL_savestack); 637 Safefree (PL_savestack);
631#if !PERL_VERSION_ATLEAST (5,9,0) 638#if !PERL_VERSION_ATLEAST (5,10,0)
632 Safefree (PL_retstack); 639 Safefree (PL_retstack);
633#endif 640#endif
634} 641}
635 642
636static size_t 643static size_t
660 rss += slot->tmps_max * sizeof (SV *); 667 rss += slot->tmps_max * sizeof (SV *);
661 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 668 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
662 rss += slot->scopestack_max * sizeof (I32); 669 rss += slot->scopestack_max * sizeof (I32);
663 rss += slot->savestack_max * sizeof (ANY); 670 rss += slot->savestack_max * sizeof (ANY);
664 671
665#if !PERL_VERSION_ATLEAST (5,9,0) 672#if !PERL_VERSION_ATLEAST (5,10,0)
666 rss += slot->retstack_max * sizeof (OP *); 673 rss += slot->retstack_max * sizeof (OP *);
667#endif 674#endif
668 } 675 }
669 676
670 return rss; 677 return rss;
671} 678}
672 679
673/** coroutine stack handling ************************************************/ 680/** coroutine stack handling ************************************************/
681
682static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
683static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
684
685/*
686 * This overrides the default magic get method of %SIG elements.
687 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
688 * and instead of tryign to save and restore the hash elements, we just provide
689 * readback here.
690 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
691 * not expecting this to actually change the hook. This is a potential problem
692 * when a schedule happens then, but we ignore this.
693 */
694static int
695coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
696{
697 const char *s = MgPV_nolen_const (mg);
698
699 if (*s == '_')
700 {
701 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
702 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
703 }
704
705 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
706}
707
708static int
709coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
710{
711 const char *s = MgPV_nolen_const (mg);
712
713 if (*s == '_')
714 {
715 SV **svp = 0;
716
717 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
718 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
719
720 if (svp)
721 {
722 SV *old = *svp;
723 *svp = newSVsv (sv);
724 SvREFCNT_dec (old);
725 return 0;
726 }
727 }
728
729 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
730}
674 731
675static void 732static void
676coro_setup (pTHX_ struct coro *coro) 733coro_setup (pTHX_ struct coro *coro)
677{ 734{
678 /* 735 /*
687 PL_curpm = 0; 744 PL_curpm = 0;
688 PL_curpad = 0; 745 PL_curpad = 0;
689 PL_localizing = 0; 746 PL_localizing = 0;
690 PL_dirty = 0; 747 PL_dirty = 0;
691 PL_restartop = 0; 748 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 749#if PERL_VERSION_ATLEAST (5,10,0)
693 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 750 PL_parser = 0;
751#endif
752
753 /* recreate the die/warn hooks */
754 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
755 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
694 756
695 GvSV (PL_defgv) = newSV (0); 757 GvSV (PL_defgv) = newSV (0);
696 GvAV (PL_defgv) = coro->args; coro->args = 0; 758 GvAV (PL_defgv) = coro->args; coro->args = 0;
697 GvSV (PL_errgv) = newSV (0); 759 GvSV (PL_errgv) = newSV (0);
698 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 760 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
812 PUSHMARK (SP); 874 PUSHMARK (SP);
813 PUSHs (&PL_sv_no); 875 PUSHs (&PL_sv_no);
814 PUSHs (fullname); 876 PUSHs (fullname);
815 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 877 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
816 PUTBACK; 878 PUTBACK;
817 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 879 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
818 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 880 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
819 SPAGAIN; 881 SPAGAIN;
820 FREETMPS; 882 FREETMPS;
821 LEAVE; 883 LEAVE;
822 PL_runops = runops_trace; 884 PL_runops = runops_trace;
849 SAVETMPS; 911 SAVETMPS;
850 EXTEND (SP, 3); 912 EXTEND (SP, 3);
851 PUSHMARK (SP); 913 PUSHMARK (SP);
852 PUSHs (&PL_sv_yes); 914 PUSHs (&PL_sv_yes);
853 PUSHs (fullname); 915 PUSHs (fullname);
854 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 916 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
855 PUTBACK; 917 PUTBACK;
856 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 918 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
857 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 919 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
858 SPAGAIN; 920 SPAGAIN;
859 FREETMPS; 921 FREETMPS;
860 LEAVE; 922 LEAVE;
861 PL_runops = runops_trace; 923 PL_runops = runops_trace;
875 PL_runops = RUNOPS_DEFAULT; 937 PL_runops = RUNOPS_DEFAULT;
876 PUSHMARK (SP); 938 PUSHMARK (SP);
877 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 939 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
878 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 940 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
879 PUTBACK; 941 PUTBACK;
880 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 942 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
881 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 943 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
882 SPAGAIN; 944 SPAGAIN;
883 FREETMPS; 945 FREETMPS;
884 LEAVE; 946 LEAVE;
885 PL_runops = runops_trace; 947 PL_runops = runops_trace;
1075 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1137 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1076 1138
1077 if (expect_false (next->flags & CF_DESTROYED)) 1139 if (expect_false (next->flags & CF_DESTROYED))
1078 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1140 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1079 1141
1080 if (
1081#if PERL_VERSION_ATLEAST (5,9,0) 1142#if !PERL_VERSION_ATLEAST (5,10,0)
1082 expect_false (PL_parser)
1083#else
1084 expect_false (PL_lex_state != LEX_NOTPARSING) 1143 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1085#endif
1086 )
1087 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1144 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1145#endif
1088 } 1146 }
1089} 1147}
1090 1148
1091/* always use the TRANSFER macro */ 1149/* always use the TRANSFER macro */
1092static void NOINLINE 1150static void NOINLINE
1093transfer (pTHX_ struct coro *prev, struct coro *next) 1151transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1094{ 1152{
1095 dSTACKLEVEL; 1153 dSTACKLEVEL;
1154 static volatile int has_throw;
1096 1155
1097 /* sometimes transfer is only called to set idle_sp */ 1156 /* sometimes transfer is only called to set idle_sp */
1098 if (expect_false (!next)) 1157 if (expect_false (!next))
1099 { 1158 {
1100 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1159 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1115 prev->flags &= ~CF_RUNNING; 1174 prev->flags &= ~CF_RUNNING;
1116 next->flags |= CF_RUNNING; 1175 next->flags |= CF_RUNNING;
1117 1176
1118 LOCK; 1177 LOCK;
1119 1178
1179 /* first get rid of the old state */
1180 save_perl (aTHX_ prev);
1181
1120 if (expect_false (next->flags & CF_NEW)) 1182 if (expect_false (next->flags & CF_NEW))
1121 { 1183 {
1122 /* need to start coroutine */ 1184 /* need to start coroutine */
1123 next->flags &= ~CF_NEW; 1185 next->flags &= ~CF_NEW;
1124 /* first get rid of the old state */
1125 save_perl (aTHX_ prev);
1126 /* setup coroutine call */ 1186 /* setup coroutine call */
1127 coro_setup (aTHX_ next); 1187 coro_setup (aTHX_ next);
1128 } 1188 }
1129 else 1189 else
1130 {
1131 /* coroutine already started */
1132 save_perl (aTHX_ prev);
1133 load_perl (aTHX_ next); 1190 load_perl (aTHX_ next);
1134 }
1135 1191
1136 prev__cctx = prev->cctx; 1192 prev__cctx = prev->cctx;
1137 1193
1138 /* possibly "free" the cctx */ 1194 /* possibly "free" the cctx */
1139 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1195 if (expect_true (
1196 prev__cctx->idle_sp == STACKLEVEL
1197 && !(prev__cctx->flags & CC_TRACE)
1198 && !force_cctx
1199 ))
1140 { 1200 {
1141 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1201 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1142 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1202 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1143 1203
1144 prev->cctx = 0; 1204 prev->cctx = 0;
1154 1214
1155 ++next->usecount; 1215 ++next->usecount;
1156 1216
1157 if (expect_true (!next->cctx)) 1217 if (expect_true (!next->cctx))
1158 next->cctx = cctx_get (aTHX); 1218 next->cctx = cctx_get (aTHX);
1219
1220 has_throw = !!next->throw;
1159 1221
1160 if (expect_false (prev__cctx != next->cctx)) 1222 if (expect_false (prev__cctx != next->cctx))
1161 { 1223 {
1162 prev__cctx->top_env = PL_top_env; 1224 prev__cctx->top_env = PL_top_env;
1163 PL_top_env = next->cctx->top_env; 1225 PL_top_env = next->cctx->top_env;
1165 } 1227 }
1166 1228
1167 free_coro_mortal (aTHX); 1229 free_coro_mortal (aTHX);
1168 UNLOCK; 1230 UNLOCK;
1169 1231
1170 if (expect_false (prev->throw || next->throw)) 1232 if (expect_false (has_throw))
1171 { 1233 {
1172 struct coro *coro = SvSTATE (coro_current); 1234 struct coro *coro = SvSTATE (coro_current);
1173 1235
1174 if (coro->throw) 1236 if (coro->throw)
1175 { 1237 {
1185struct transfer_args 1247struct transfer_args
1186{ 1248{
1187 struct coro *prev, *next; 1249 struct coro *prev, *next;
1188}; 1250};
1189 1251
1190#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1252#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1191#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1253#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1192 1254
1193/** high level stuff ********************************************************/ 1255/** high level stuff ********************************************************/
1194 1256
1195static int 1257static int
1289{ 1351{
1290 dTHX; 1352 dTHX;
1291 struct transfer_args ta; 1353 struct transfer_args ta;
1292 1354
1293 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1355 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1294 TRANSFER (ta); 1356 TRANSFER (ta, 1);
1295} 1357}
1296 1358
1297/** Coro ********************************************************************/ 1359/** Coro ********************************************************************/
1298 1360
1299static void 1361static void
1301{ 1363{
1302 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1364 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1303} 1365}
1304 1366
1305static SV * 1367static SV *
1306coro_deq (pTHX_ int min_prio) 1368coro_deq (pTHX)
1307{ 1369{
1308 int prio = PRIO_MAX - PRIO_MIN; 1370 int prio;
1309 1371
1310 min_prio -= PRIO_MIN;
1311 if (min_prio < 0)
1312 min_prio = 0;
1313
1314 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1372 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1315 if (AvFILLp (coro_ready [prio]) >= 0) 1373 if (AvFILLp (coro_ready [prio]) >= 0)
1316 return av_shift (coro_ready [prio]); 1374 return av_shift (coro_ready [prio]);
1317 1375
1318 return 0; 1376 return 0;
1319} 1377}
1355 SV *prev_sv, *next_sv; 1413 SV *prev_sv, *next_sv;
1356 1414
1357 for (;;) 1415 for (;;)
1358 { 1416 {
1359 LOCK; 1417 LOCK;
1360 next_sv = coro_deq (aTHX_ PRIO_MIN); 1418 next_sv = coro_deq (aTHX);
1361 1419
1362 /* nothing to schedule: call the idle handler */ 1420 /* nothing to schedule: call the idle handler */
1363 if (expect_false (!next_sv)) 1421 if (expect_false (!next_sv))
1364 { 1422 {
1365 dSP; 1423 dSP;
1369 SAVETMPS; 1427 SAVETMPS;
1370 1428
1371 PUSHMARK (SP); 1429 PUSHMARK (SP);
1372 PUTBACK; 1430 PUTBACK;
1373 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1431 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1432 SPAGAIN;
1374 1433
1375 FREETMPS; 1434 FREETMPS;
1376 LEAVE; 1435 LEAVE;
1377 continue; 1436 continue;
1378 } 1437 }
1433{ 1492{
1434 dTHX; 1493 dTHX;
1435 struct transfer_args ta; 1494 struct transfer_args ta;
1436 1495
1437 prepare_schedule (aTHX_ &ta); 1496 prepare_schedule (aTHX_ &ta);
1438 TRANSFER (ta); 1497 TRANSFER (ta, 1);
1439} 1498}
1440 1499
1441static int 1500static int
1442api_cede (void) 1501api_cede (void)
1443{ 1502{
1446 1505
1447 prepare_cede (aTHX_ &ta); 1506 prepare_cede (aTHX_ &ta);
1448 1507
1449 if (expect_true (ta.prev != ta.next)) 1508 if (expect_true (ta.prev != ta.next))
1450 { 1509 {
1451 TRANSFER (ta); 1510 TRANSFER (ta, 1);
1452 return 1; 1511 return 1;
1453 } 1512 }
1454 else 1513 else
1455 return 0; 1514 return 0;
1456} 1515}
1461 dTHX; 1520 dTHX;
1462 struct transfer_args ta; 1521 struct transfer_args ta;
1463 1522
1464 if (prepare_cede_notself (aTHX_ &ta)) 1523 if (prepare_cede_notself (aTHX_ &ta))
1465 { 1524 {
1466 TRANSFER (ta); 1525 TRANSFER (ta, 1);
1467 return 1; 1526 return 1;
1468 } 1527 }
1469 else 1528 else
1470 return 0; 1529 return 0;
1471} 1530}
1508 BOOT_PAGESIZE; 1567 BOOT_PAGESIZE;
1509 1568
1510 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1569 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1511 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1570 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1512 1571
1572 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1573 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1574 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1575 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1576
1513 hv_sig = coro_get_hv ("SIG", TRUE); 1577 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1514 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1578 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1515 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1579 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1516
1517 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1518 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1519 1580
1520 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1581 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1521 1582
1522 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1583 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1523 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1584 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1540SV * 1601SV *
1541new (char *klass, ...) 1602new (char *klass, ...)
1542 CODE: 1603 CODE:
1543{ 1604{
1544 struct coro *coro; 1605 struct coro *coro;
1606 MAGIC *mg;
1545 HV *hv; 1607 HV *hv;
1546 int i; 1608 int i;
1547 1609
1548 Newz (0, coro, 1, struct coro); 1610 Newz (0, coro, 1, struct coro);
1549 coro->args = newAV (); 1611 coro->args = newAV ();
1552 if (coro_first) coro_first->prev = coro; 1614 if (coro_first) coro_first->prev = coro;
1553 coro->next = coro_first; 1615 coro->next = coro_first;
1554 coro_first = coro; 1616 coro_first = coro;
1555 1617
1556 coro->hv = hv = newHV (); 1618 coro->hv = hv = newHV ();
1557 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1619 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1620 mg->mg_flags |= MGf_DUP;
1558 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1621 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1559 1622
1560 av_extend (coro->args, items - 1); 1623 av_extend (coro->args, items - 1);
1561 for (i = 1; i < items; i++) 1624 for (i = 1; i < items; i++)
1562 av_push (coro->args, newSVsv (ST (i))); 1625 av_push (coro->args, newSVsv (ST (i)));
1576 Coro::cede_notself = 4 1639 Coro::cede_notself = 4
1577 CODE: 1640 CODE:
1578{ 1641{
1579 struct transfer_args ta; 1642 struct transfer_args ta;
1580 1643
1644 PUTBACK;
1581 switch (ix) 1645 switch (ix)
1582 { 1646 {
1583 case 0: 1647 case 0:
1584 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1648 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1585 ta.next = 0; 1649 ta.next = 0;
1604 if (!prepare_cede_notself (aTHX_ &ta)) 1668 if (!prepare_cede_notself (aTHX_ &ta))
1605 XSRETURN_EMPTY; 1669 XSRETURN_EMPTY;
1606 1670
1607 break; 1671 break;
1608 } 1672 }
1673 SPAGAIN;
1609 1674
1610 BARRIER; 1675 BARRIER;
1611 PUTBACK; 1676 PUTBACK;
1612 TRANSFER (ta); 1677 TRANSFER (ta, 0);
1613 SPAGAIN; /* might be the sp of a different coroutine now */ 1678 SPAGAIN; /* might be the sp of a different coroutine now */
1614 /* be extra careful not to ever do anything after TRANSFER */ 1679 /* be extra careful not to ever do anything after TRANSFER */
1615} 1680}
1616 1681
1617bool 1682bool
1671 { 1736 {
1672 struct coro temp; 1737 struct coro temp;
1673 1738
1674 if (!(coro->flags & CF_RUNNING)) 1739 if (!(coro->flags & CF_RUNNING))
1675 { 1740 {
1741 PUTBACK;
1676 save_perl (aTHX_ &temp); 1742 save_perl (aTHX_ &temp);
1677 load_perl (aTHX_ coro); 1743 load_perl (aTHX_ coro);
1678 } 1744 }
1679 1745
1680 { 1746 {
1699 1765
1700 if (!(coro->flags & CF_RUNNING)) 1766 if (!(coro->flags & CF_RUNNING))
1701 { 1767 {
1702 save_perl (aTHX_ coro); 1768 save_perl (aTHX_ coro);
1703 load_perl (aTHX_ &temp); 1769 load_perl (aTHX_ &temp);
1770 SPAGAIN;
1704 } 1771 }
1705 } 1772 }
1706} 1773}
1707 1774
1708SV * 1775SV *
1749 case 1: RETVAL = coro->usecount; break; 1816 case 1: RETVAL = coro->usecount; break;
1750 } 1817 }
1751 OUTPUT: 1818 OUTPUT:
1752 RETVAL 1819 RETVAL
1753 1820
1821void
1822force_cctx ()
1823 CODE:
1824 struct coro *coro = SvSTATE (coro_current);
1825 coro->cctx->idle_sp = 0;
1754 1826
1755MODULE = Coro::State PACKAGE = Coro 1827MODULE = Coro::State PACKAGE = Coro
1756 1828
1757BOOT: 1829BOOT:
1758{ 1830{
1759 int i; 1831 int i;
1760 1832
1761 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1833 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1762 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1834 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1763 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1835 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1764 1836
1765 coro_current = coro_get_sv ("Coro::current", FALSE); 1837 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1766 SvREADONLY_on (coro_current); 1838 SvREADONLY_on (coro_current);
1767 1839
1768 coro_stash = gv_stashpv ("Coro", TRUE); 1840 coro_stash = gv_stashpv ("Coro", TRUE);
1769 1841
1770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1845 PROTOTYPE: $;$ 1917 PROTOTYPE: $;$
1846 CODE: 1918 CODE:
1847 SvREFCNT_dec (self->throw); 1919 SvREFCNT_dec (self->throw);
1848 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1920 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1849 1921
1922void
1923swap_defsv (Coro::State self)
1924 PROTOTYPE: $
1925 ALIAS:
1926 swap_defav = 1
1927 CODE:
1928 if (!self->slot)
1929 croak ("cannot swap state with coroutine that has no saved state");
1930 else
1931 {
1932 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1933 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1934
1935 SV *tmp = *src; *src = *dst; *dst = tmp;
1936 }
1937
1850# for async_pool speedup 1938# for async_pool speedup
1851void 1939void
1852_pool_1 (SV *cb) 1940_pool_1 (SV *cb)
1853 CODE: 1941 CODE:
1854{ 1942{
1855 struct coro *coro = SvSTATE (coro_current); 1943 struct coro *coro = SvSTATE (coro_current);
1856 HV *hv = (HV *)SvRV (coro_current); 1944 HV *hv = (HV *)SvRV (coro_current);
1857 AV *defav = GvAV (PL_defgv); 1945 AV *defav = GvAV (PL_defgv);
1858 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1946 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1859 AV *invoke_av; 1947 AV *invoke_av;
1860 int i, len; 1948 int i, len;
1861 1949
1862 if (!invoke) 1950 if (!invoke)
1951 {
1952 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1863 croak ("\3async_pool terminate\2\n"); 1953 croak ("\3async_pool terminate\2\n");
1954 }
1864 1955
1865 SvREFCNT_dec (coro->saved_deffh); 1956 SvREFCNT_dec (coro->saved_deffh);
1866 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1957 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1867 1958
1868 hv_store (hv, "desc", sizeof ("desc") - 1, 1959 hv_store (hv, "desc", sizeof ("desc") - 1,
1869 newSVpvn (strpair ("[async_pool]")), 0); 1960 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1870 1961
1871 invoke_av = (AV *)SvRV (invoke); 1962 invoke_av = (AV *)SvRV (invoke);
1872 len = av_len (invoke_av); 1963 len = av_len (invoke_av);
1873 1964
1874 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1965 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1894 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1985 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1895 coro->saved_deffh = 0; 1986 coro->saved_deffh = 0;
1896 1987
1897 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1988 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1898 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1989 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1990 {
1991 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1899 croak ("\3async_pool terminate\2\n"); 1992 croak ("\3async_pool terminate\2\n");
1993 }
1900 1994
1901 av_clear (GvAV (PL_defgv)); 1995 av_clear (GvAV (PL_defgv));
1902 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1996 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1903 newSVpvn (strpair ("[async_pool idle]")), 0); 1997 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1904 1998
1905 coro->prio = 0; 1999 coro->prio = 0;
1906 2000
1907 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2001 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1908 api_trace (coro_current, 0); 2002 api_trace (coro_current, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines