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.213 by root, Thu Oct 11 00:40:48 2007 UTC vs.
Revision 1.231 by root, Thu Apr 24 10:31:59 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#include <setjmp.h>
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
145static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 161static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
151 164
152static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
154 167static SV *rv_diehook;
168static SV *rv_warnhook;
155static HV *hv_sig; /* %SIG */ 169static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
158 170
159/* async_pool helper stuff */ 171/* async_pool helper stuff */
160static SV *sv_pool_rss; 172static SV *sv_pool_rss;
161static SV *sv_pool_size; 173static SV *sv_pool_size;
162static AV *av_async_pool; 174static AV *av_async_pool;
262/** lowlevel stuff **********************************************************/ 274/** lowlevel stuff **********************************************************/
263 275
264static SV * 276static SV *
265coro_get_sv (pTHX_ const char *name, int create) 277coro_get_sv (pTHX_ const char *name, int create)
266{ 278{
267#if PERL_VERSION_ATLEAST (5,9,0) 279#if PERL_VERSION_ATLEAST (5,10,0)
268 /* 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 */
269 get_sv (name, create); 281 get_sv (name, create);
270#endif 282#endif
271 return get_sv (name, create); 283 return get_sv (name, create);
272} 284}
273 285
274static AV * 286static AV *
275coro_get_av (pTHX_ const char *name, int create) 287coro_get_av (pTHX_ const char *name, int create)
276{ 288{
277#if PERL_VERSION_ATLEAST (5,9,0) 289#if PERL_VERSION_ATLEAST (5,10,0)
278 /* 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 */
279 get_av (name, create); 291 get_av (name, create);
280#endif 292#endif
281 return get_av (name, create); 293 return get_av (name, create);
282} 294}
283 295
284static HV * 296static HV *
285coro_get_hv (pTHX_ const char *name, int create) 297coro_get_hv (pTHX_ const char *name, int create)
286{ 298{
287#if PERL_VERSION_ATLEAST (5,9,0) 299#if PERL_VERSION_ATLEAST (5,10,0)
288 /* 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 */
289 get_hv (name, create); 301 get_hv (name, create);
290#endif 302#endif
291 return get_hv (name, create); 303 return get_hv (name, create);
292} 304}
297 AV *padlist = CvPADLIST (cv); 309 AV *padlist = CvPADLIST (cv);
298 AV *newpadlist, *newpad; 310 AV *newpadlist, *newpad;
299 311
300 newpadlist = newAV (); 312 newpadlist = newAV ();
301 AvREAL_off (newpadlist); 313 AvREAL_off (newpadlist);
302#if PERL_VERSION_ATLEAST (5,9,0) 314#if PERL_VERSION_ATLEAST (5,10,0)
303 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 315 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
304#else 316#else
305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 317 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
306#endif 318#endif
307 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 319 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
345 357
346 /* casting is fun. */ 358 /* casting is fun. */
347 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 359 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
348 free_padlist (aTHX_ padlist); 360 free_padlist (aTHX_ padlist);
349 361
350 SvREFCNT_dec (av);
351
352 return 0; 362 return 0;
353} 363}
354 364
355#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
356 367
357static 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};
358 372
359#define CORO_MAGIC(cv) \ 373#define CORO_MAGIC(sv,type) \
360 SvMAGIC (cv) \ 374 SvMAGIC (sv) \
361 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 375 ? SvMAGIC (sv)->mg_type == type \
362 ? SvMAGIC (cv) \ 376 ? SvMAGIC (sv) \
363 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 377 : mg_find (sv, type) \
364 : 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)
365 382
366static struct coro * 383static struct coro *
367SvSTATE_ (pTHX_ SV *coro) 384SvSTATE_ (pTHX_ SV *coro)
368{ 385{
369 HV *stash; 386 HV *stash;
381 /* very slow, but rare, check */ 398 /* very slow, but rare, check */
382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 399 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
383 croak ("Coro::State object required"); 400 croak ("Coro::State object required");
384 } 401 }
385 402
386 mg = CORO_MAGIC (coro); 403 mg = CORO_MAGIC_state (coro);
387 return (struct coro *)mg->mg_ptr; 404 return (struct coro *)mg->mg_ptr;
388} 405}
389 406
390#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 407#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
391 408
392/* the next two functions merely cache the padlists */ 409/* the next two functions merely cache the padlists */
393static void 410static void
394get_padlist (pTHX_ CV *cv) 411get_padlist (pTHX_ CV *cv)
395{ 412{
396 MAGIC *mg = CORO_MAGIC (cv); 413 MAGIC *mg = CORO_MAGIC_cv (cv);
397 AV *av; 414 AV *av;
398 415
399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 416 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 417 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
401 else 418 else
413} 430}
414 431
415static void 432static void
416put_padlist (pTHX_ CV *cv) 433put_padlist (pTHX_ CV *cv)
417{ 434{
418 MAGIC *mg = CORO_MAGIC (cv); 435 MAGIC *mg = CORO_MAGIC_cv (cv);
419 AV *av; 436 AV *av;
420 437
421 if (expect_false (!mg)) 438 if (expect_false (!mg))
422 { 439 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
425 mg->mg_virtual = &vtbl_coro;
426 mg->mg_obj = (SV *)newAV ();
427 }
428 440
429 av = (AV *)mg->mg_obj; 441 av = (AV *)mg->mg_obj;
430 442
431 if (expect_false (AvFILLp (av) >= AvMAX (av))) 443 if (expect_false (AvFILLp (av) >= AvMAX (av)))
432 av_extend (av, AvMAX (av) + 1); 444 av_extend (av, AvMAX (av) + 1);
450 GvSV (irsgv) = slot->irsgv; 462 GvSV (irsgv) = slot->irsgv;
451 463
452 #define VAR(name,type) PL_ ## name = slot->name; 464 #define VAR(name,type) PL_ ## name = slot->name;
453 # include "state.h" 465 # include "state.h"
454 #undef VAR 466 #undef VAR
455
456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
458 467
459 { 468 {
460 dSP; 469 dSP;
461 470
462 CV *cv; 471 CV *cv;
591 600
592 New(54,PL_savestack,24,ANY); 601 New(54,PL_savestack,24,ANY);
593 PL_savestack_ix = 0; 602 PL_savestack_ix = 0;
594 PL_savestack_max = 24; 603 PL_savestack_max = 24;
595 604
596#if !PERL_VERSION_ATLEAST (5,9,0) 605#if !PERL_VERSION_ATLEAST (5,10,0)
597 New(54,PL_retstack,4,OP*); 606 New(54,PL_retstack,4,OP*);
598 PL_retstack_ix = 0; 607 PL_retstack_ix = 0;
599 PL_retstack_max = 4; 608 PL_retstack_max = 4;
600#endif 609#endif
601} 610}
624 633
625 Safefree (PL_tmps_stack); 634 Safefree (PL_tmps_stack);
626 Safefree (PL_markstack); 635 Safefree (PL_markstack);
627 Safefree (PL_scopestack); 636 Safefree (PL_scopestack);
628 Safefree (PL_savestack); 637 Safefree (PL_savestack);
629#if !PERL_VERSION_ATLEAST (5,9,0) 638#if !PERL_VERSION_ATLEAST (5,10,0)
630 Safefree (PL_retstack); 639 Safefree (PL_retstack);
631#endif 640#endif
632} 641}
633 642
634static size_t 643static size_t
658 rss += slot->tmps_max * sizeof (SV *); 667 rss += slot->tmps_max * sizeof (SV *);
659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 668 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
660 rss += slot->scopestack_max * sizeof (I32); 669 rss += slot->scopestack_max * sizeof (I32);
661 rss += slot->savestack_max * sizeof (ANY); 670 rss += slot->savestack_max * sizeof (ANY);
662 671
663#if !PERL_VERSION_ATLEAST (5,9,0) 672#if !PERL_VERSION_ATLEAST (5,10,0)
664 rss += slot->retstack_max * sizeof (OP *); 673 rss += slot->retstack_max * sizeof (OP *);
665#endif 674#endif
666 } 675 }
667 676
668 return rss; 677 return rss;
669} 678}
670 679
671/** 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}
672 731
673static void 732static void
674coro_setup (pTHX_ struct coro *coro) 733coro_setup (pTHX_ struct coro *coro)
675{ 734{
676 /* 735 /*
685 PL_curpm = 0; 744 PL_curpm = 0;
686 PL_curpad = 0; 745 PL_curpad = 0;
687 PL_localizing = 0; 746 PL_localizing = 0;
688 PL_dirty = 0; 747 PL_dirty = 0;
689 PL_restartop = 0; 748 PL_restartop = 0;
749#if PERL_VERSION_ATLEAST (5,10,0)
750 PL_parser = 0;
751#endif
752
753 /* recreate the die/warn hooks */
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0); 754 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0); 755 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
692 756
693 GvSV (PL_defgv) = newSV (0); 757 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0; 758 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0); 759 GvSV (PL_errgv) = newSV (0);
696 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);
847 SAVETMPS; 911 SAVETMPS;
848 EXTEND (SP, 3); 912 EXTEND (SP, 3);
849 PUSHMARK (SP); 913 PUSHMARK (SP);
850 PUSHs (&PL_sv_yes); 914 PUSHs (&PL_sv_yes);
851 PUSHs (fullname); 915 PUSHs (fullname);
852 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);
853 PUTBACK; 917 PUTBACK;
854 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 918 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
855 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);
856 SPAGAIN; 920 SPAGAIN;
857 FREETMPS; 921 FREETMPS;
1073 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");
1074 1138
1075 if (expect_false (next->flags & CF_DESTROYED)) 1139 if (expect_false (next->flags & CF_DESTROYED))
1076 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");
1077 1141
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0) 1142#if !PERL_VERSION_ATLEAST (5,10,0)
1080 expect_false (PL_parser)
1081#else
1082 expect_false (PL_lex_state != LEX_NOTPARSING) 1143 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1083#endif
1084 )
1085 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
1086 } 1146 }
1087} 1147}
1088 1148
1089/* always use the TRANSFER macro */ 1149/* always use the TRANSFER macro */
1090static void NOINLINE 1150static void NOINLINE
1091transfer (pTHX_ struct coro *prev, struct coro *next) 1151transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1092{ 1152{
1093 dSTACKLEVEL; 1153 dSTACKLEVEL;
1154 static volatile int has_throw;
1094 1155
1095 /* sometimes transfer is only called to set idle_sp */ 1156 /* sometimes transfer is only called to set idle_sp */
1096 if (expect_false (!next)) 1157 if (expect_false (!next))
1097 { 1158 {
1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1159 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1113 prev->flags &= ~CF_RUNNING; 1174 prev->flags &= ~CF_RUNNING;
1114 next->flags |= CF_RUNNING; 1175 next->flags |= CF_RUNNING;
1115 1176
1116 LOCK; 1177 LOCK;
1117 1178
1179 /* first get rid of the old state */
1180 save_perl (aTHX_ prev);
1181
1118 if (expect_false (next->flags & CF_NEW)) 1182 if (expect_false (next->flags & CF_NEW))
1119 { 1183 {
1120 /* need to start coroutine */ 1184 /* need to start coroutine */
1121 next->flags &= ~CF_NEW; 1185 next->flags &= ~CF_NEW;
1122 /* first get rid of the old state */
1123 save_perl (aTHX_ prev);
1124 /* setup coroutine call */ 1186 /* setup coroutine call */
1125 coro_setup (aTHX_ next); 1187 coro_setup (aTHX_ next);
1126 } 1188 }
1127 else 1189 else
1128 {
1129 /* coroutine already started */
1130 save_perl (aTHX_ prev);
1131 load_perl (aTHX_ next); 1190 load_perl (aTHX_ next);
1132 }
1133 1191
1134 prev__cctx = prev->cctx; 1192 prev__cctx = prev->cctx;
1135 1193
1136 /* possibly "free" the cctx */ 1194 /* possibly "free" the cctx */
1137 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 ))
1138 { 1200 {
1139 /* 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 */
1140 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));
1141 1203
1142 prev->cctx = 0; 1204 prev->cctx = 0;
1152 1214
1153 ++next->usecount; 1215 ++next->usecount;
1154 1216
1155 if (expect_true (!next->cctx)) 1217 if (expect_true (!next->cctx))
1156 next->cctx = cctx_get (aTHX); 1218 next->cctx = cctx_get (aTHX);
1219
1220 has_throw = !!next->throw;
1157 1221
1158 if (expect_false (prev__cctx != next->cctx)) 1222 if (expect_false (prev__cctx != next->cctx))
1159 { 1223 {
1160 prev__cctx->top_env = PL_top_env; 1224 prev__cctx->top_env = PL_top_env;
1161 PL_top_env = next->cctx->top_env; 1225 PL_top_env = next->cctx->top_env;
1163 } 1227 }
1164 1228
1165 free_coro_mortal (aTHX); 1229 free_coro_mortal (aTHX);
1166 UNLOCK; 1230 UNLOCK;
1167 1231
1168 if (expect_false (prev->throw || next->throw)) 1232 if (expect_false (has_throw))
1169 { 1233 {
1170 struct coro *coro = SvSTATE (coro_current); 1234 struct coro *coro = SvSTATE (coro_current);
1171 1235
1172 if (coro->throw) 1236 if (coro->throw)
1173 { 1237 {
1183struct transfer_args 1247struct transfer_args
1184{ 1248{
1185 struct coro *prev, *next; 1249 struct coro *prev, *next;
1186}; 1250};
1187 1251
1188#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1252#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1189#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1253#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1190 1254
1191/** high level stuff ********************************************************/ 1255/** high level stuff ********************************************************/
1192 1256
1193static int 1257static int
1287{ 1351{
1288 dTHX; 1352 dTHX;
1289 struct transfer_args ta; 1353 struct transfer_args ta;
1290 1354
1291 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1355 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1292 TRANSFER (ta); 1356 TRANSFER (ta, 1);
1293} 1357}
1294 1358
1295/** Coro ********************************************************************/ 1359/** Coro ********************************************************************/
1296 1360
1297static void 1361static void
1299{ 1363{
1300 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);
1301} 1365}
1302 1366
1303static SV * 1367static SV *
1304coro_deq (pTHX_ int min_prio) 1368coro_deq (pTHX)
1305{ 1369{
1306 int prio = PRIO_MAX - PRIO_MIN; 1370 int prio;
1307 1371
1308 min_prio -= PRIO_MIN;
1309 if (min_prio < 0)
1310 min_prio = 0;
1311
1312 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1372 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1313 if (AvFILLp (coro_ready [prio]) >= 0) 1373 if (AvFILLp (coro_ready [prio]) >= 0)
1314 return av_shift (coro_ready [prio]); 1374 return av_shift (coro_ready [prio]);
1315 1375
1316 return 0; 1376 return 0;
1317} 1377}
1353 SV *prev_sv, *next_sv; 1413 SV *prev_sv, *next_sv;
1354 1414
1355 for (;;) 1415 for (;;)
1356 { 1416 {
1357 LOCK; 1417 LOCK;
1358 next_sv = coro_deq (aTHX_ PRIO_MIN); 1418 next_sv = coro_deq (aTHX);
1359 1419
1360 /* nothing to schedule: call the idle handler */ 1420 /* nothing to schedule: call the idle handler */
1361 if (expect_false (!next_sv)) 1421 if (expect_false (!next_sv))
1362 { 1422 {
1363 dSP; 1423 dSP;
1367 SAVETMPS; 1427 SAVETMPS;
1368 1428
1369 PUSHMARK (SP); 1429 PUSHMARK (SP);
1370 PUTBACK; 1430 PUTBACK;
1371 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1431 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1432 SPAGAIN;
1372 1433
1373 FREETMPS; 1434 FREETMPS;
1374 LEAVE; 1435 LEAVE;
1375 continue; 1436 continue;
1376 } 1437 }
1431{ 1492{
1432 dTHX; 1493 dTHX;
1433 struct transfer_args ta; 1494 struct transfer_args ta;
1434 1495
1435 prepare_schedule (aTHX_ &ta); 1496 prepare_schedule (aTHX_ &ta);
1436 TRANSFER (ta); 1497 TRANSFER (ta, 1);
1437} 1498}
1438 1499
1439static int 1500static int
1440api_cede (void) 1501api_cede (void)
1441{ 1502{
1444 1505
1445 prepare_cede (aTHX_ &ta); 1506 prepare_cede (aTHX_ &ta);
1446 1507
1447 if (expect_true (ta.prev != ta.next)) 1508 if (expect_true (ta.prev != ta.next))
1448 { 1509 {
1449 TRANSFER (ta); 1510 TRANSFER (ta, 1);
1450 return 1; 1511 return 1;
1451 } 1512 }
1452 else 1513 else
1453 return 0; 1514 return 0;
1454} 1515}
1459 dTHX; 1520 dTHX;
1460 struct transfer_args ta; 1521 struct transfer_args ta;
1461 1522
1462 if (prepare_cede_notself (aTHX_ &ta)) 1523 if (prepare_cede_notself (aTHX_ &ta))
1463 { 1524 {
1464 TRANSFER (ta); 1525 TRANSFER (ta, 1);
1465 return 1; 1526 return 1;
1466 } 1527 }
1467 else 1528 else
1468 return 0; 1529 return 0;
1469} 1530}
1506 BOOT_PAGESIZE; 1567 BOOT_PAGESIZE;
1507 1568
1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1569 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1570 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510 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
1511 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1577 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1512 sv_diehook = coro_get_sv (aTHX_ "Coro::State::DIEHOOK" , TRUE); 1578 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1513 sv_warnhook = coro_get_sv (aTHX_ "Coro::State::WARNHOOK", TRUE); 1579 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1517 1580
1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1581 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1519 1582
1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1583 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1584 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1538SV * 1601SV *
1539new (char *klass, ...) 1602new (char *klass, ...)
1540 CODE: 1603 CODE:
1541{ 1604{
1542 struct coro *coro; 1605 struct coro *coro;
1606 MAGIC *mg;
1543 HV *hv; 1607 HV *hv;
1544 int i; 1608 int i;
1545 1609
1546 Newz (0, coro, 1, struct coro); 1610 Newz (0, coro, 1, struct coro);
1547 coro->args = newAV (); 1611 coro->args = newAV ();
1550 if (coro_first) coro_first->prev = coro; 1614 if (coro_first) coro_first->prev = coro;
1551 coro->next = coro_first; 1615 coro->next = coro_first;
1552 coro_first = coro; 1616 coro_first = coro;
1553 1617
1554 coro->hv = hv = newHV (); 1618 coro->hv = hv = newHV ();
1555 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;
1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1621 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1557 1622
1558 av_extend (coro->args, items - 1); 1623 av_extend (coro->args, items - 1);
1559 for (i = 1; i < items; i++) 1624 for (i = 1; i < items; i++)
1560 av_push (coro->args, newSVsv (ST (i))); 1625 av_push (coro->args, newSVsv (ST (i)));
1574 Coro::cede_notself = 4 1639 Coro::cede_notself = 4
1575 CODE: 1640 CODE:
1576{ 1641{
1577 struct transfer_args ta; 1642 struct transfer_args ta;
1578 1643
1644 PUTBACK;
1579 switch (ix) 1645 switch (ix)
1580 { 1646 {
1581 case 0: 1647 case 0:
1582 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1648 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1583 ta.next = 0; 1649 ta.next = 0;
1602 if (!prepare_cede_notself (aTHX_ &ta)) 1668 if (!prepare_cede_notself (aTHX_ &ta))
1603 XSRETURN_EMPTY; 1669 XSRETURN_EMPTY;
1604 1670
1605 break; 1671 break;
1606 } 1672 }
1673 SPAGAIN;
1607 1674
1608 BARRIER; 1675 BARRIER;
1609 PUTBACK; 1676 PUTBACK;
1610 TRANSFER (ta); 1677 TRANSFER (ta, 0);
1611 SPAGAIN; /* might be the sp of a different coroutine now */ 1678 SPAGAIN; /* might be the sp of a different coroutine now */
1612 /* be extra careful not to ever do anything after TRANSFER */ 1679 /* be extra careful not to ever do anything after TRANSFER */
1613} 1680}
1614 1681
1615bool 1682bool
1669 { 1736 {
1670 struct coro temp; 1737 struct coro temp;
1671 1738
1672 if (!(coro->flags & CF_RUNNING)) 1739 if (!(coro->flags & CF_RUNNING))
1673 { 1740 {
1741 PUTBACK;
1674 save_perl (aTHX_ &temp); 1742 save_perl (aTHX_ &temp);
1675 load_perl (aTHX_ coro); 1743 load_perl (aTHX_ coro);
1676 } 1744 }
1677 1745
1678 { 1746 {
1697 1765
1698 if (!(coro->flags & CF_RUNNING)) 1766 if (!(coro->flags & CF_RUNNING))
1699 { 1767 {
1700 save_perl (aTHX_ coro); 1768 save_perl (aTHX_ coro);
1701 load_perl (aTHX_ &temp); 1769 load_perl (aTHX_ &temp);
1770 SPAGAIN;
1702 } 1771 }
1703 } 1772 }
1704} 1773}
1705 1774
1706SV * 1775SV *
1747 case 1: RETVAL = coro->usecount; break; 1816 case 1: RETVAL = coro->usecount; break;
1748 } 1817 }
1749 OUTPUT: 1818 OUTPUT:
1750 RETVAL 1819 RETVAL
1751 1820
1821void
1822force_cctx ()
1823 CODE:
1824 struct coro *coro = SvSTATE (coro_current);
1825 coro->cctx->idle_sp = 0;
1752 1826
1753MODULE = Coro::State PACKAGE = Coro 1827MODULE = Coro::State PACKAGE = Coro
1754 1828
1755BOOT: 1829BOOT:
1756{ 1830{
1843 PROTOTYPE: $;$ 1917 PROTOTYPE: $;$
1844 CODE: 1918 CODE:
1845 SvREFCNT_dec (self->throw); 1919 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1920 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847 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
1848# for async_pool speedup 1938# for async_pool speedup
1849void 1939void
1850_pool_1 (SV *cb) 1940_pool_1 (SV *cb)
1851 CODE: 1941 CODE:
1852{ 1942{
1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1946 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1857 AV *invoke_av; 1947 AV *invoke_av;
1858 int i, len; 1948 int i, len;
1859 1949
1860 if (!invoke) 1950 if (!invoke)
1951 {
1952 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1861 croak ("\3async_pool terminate\2\n"); 1953 croak ("\3async_pool terminate\2\n");
1954 }
1862 1955
1863 SvREFCNT_dec (coro->saved_deffh); 1956 SvREFCNT_dec (coro->saved_deffh);
1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1957 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1865 1958
1866 hv_store (hv, "desc", sizeof ("desc") - 1, 1959 hv_store (hv, "desc", sizeof ("desc") - 1,
1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1985 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1893 coro->saved_deffh = 0; 1986 coro->saved_deffh = 0;
1894 1987
1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1988 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1896 || 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;
1897 croak ("\3async_pool terminate\2\n"); 1992 croak ("\3async_pool terminate\2\n");
1993 }
1898 1994
1899 av_clear (GvAV (PL_defgv)); 1995 av_clear (GvAV (PL_defgv));
1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1996 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1997 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1902 1998

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines