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.212 by root, Wed Oct 10 04:21:33 2007 UTC vs.
Revision 1.229 by root, Thu Apr 10 07:45:33 2008 UTC

… …
72# ifndef IS_PADCONST 72# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
74# endif 74# endif
75#endif 75#endif
76 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
77/* 5.8.7 */ 90/* 5.8.7 */
78#ifndef SvRV_set 91#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 92# 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 93#endif
89 94
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 95#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 96# undef CORO_STACKGUARD
92#endif 97#endif
… …
145static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 153static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
151 156
152static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
154 159static SV *rv_diehook;
160static SV *rv_warnhook;
155static HV *hv_sig; /* %SIG */ 161static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
158 162
159/* async_pool helper stuff */ 163/* async_pool helper stuff */
160static SV *sv_pool_rss; 164static SV *sv_pool_rss;
161static SV *sv_pool_size; 165static SV *sv_pool_size;
162static AV *av_async_pool; 166static AV *av_async_pool;
… …
260static struct coro *coro_first; 264static struct coro *coro_first;
261 265
262/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
263 267
264static SV * 268static SV *
265coro_get_sv (const char *name, int create) 269coro_get_sv (pTHX_ const char *name, int create)
266{ 270{
267#if PERL_VERSION_ATLEAST (5,9,0) 271#if PERL_VERSION_ATLEAST (5,10,0)
268 /* 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 */
269 get_sv (name, create); 273 get_sv (name, create);
270#endif 274#endif
271 return get_sv (name, create); 275 return get_sv (name, create);
272} 276}
273 277
274static AV * 278static AV *
275coro_get_av (const char *name, int create) 279coro_get_av (pTHX_ const char *name, int create)
276{ 280{
277#if PERL_VERSION_ATLEAST (5,9,0) 281#if PERL_VERSION_ATLEAST (5,10,0)
278 /* 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 */
279 get_av (name, create); 283 get_av (name, create);
280#endif 284#endif
281 return get_av (name, create); 285 return get_av (name, create);
282} 286}
283 287
284static HV * 288static HV *
285coro_get_hv (const char *name, int create) 289coro_get_hv (pTHX_ const char *name, int create)
286{ 290{
287#if PERL_VERSION_ATLEAST (5,9,0) 291#if PERL_VERSION_ATLEAST (5,10,0)
288 /* 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 */
289 get_hv (name, create); 293 get_hv (name, create);
290#endif 294#endif
291 return get_hv (name, create); 295 return get_hv (name, create);
292} 296}
… …
297 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
298 AV *newpadlist, *newpad; 302 AV *newpadlist, *newpad;
299 303
300 newpadlist = newAV (); 304 newpadlist = newAV ();
301 AvREAL_off (newpadlist); 305 AvREAL_off (newpadlist);
302#if PERL_VERSION_ATLEAST (5,9,0) 306#if PERL_VERSION_ATLEAST (5,10,0)
303 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
304#else 308#else
305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 309 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
306#endif 310#endif
307 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 311 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
… …
345 349
346 /* casting is fun. */ 350 /* casting is fun. */
347 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
348 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
349 353
350 SvREFCNT_dec (av);
351
352 return 0; 354 return 0;
353} 355}
354 356
355#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
356 359
357static 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};
358 364
359#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
360 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
361 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
362 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
363 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
364 : 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)
365 374
366static struct coro * 375static struct coro *
367SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
368{ 377{
369 HV *stash; 378 HV *stash;
… …
381 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
383 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
384 } 393 }
385 394
386 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
387 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
388} 397}
389 398
390#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
391 400
392/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
393static void 402static void
394get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
395{ 404{
396 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
397 AV *av; 406 AV *av;
398 407
399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
401 else 410 else
… …
413} 422}
414 423
415static void 424static void
416put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
417{ 426{
418 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
419 AV *av; 428 AV *av;
420 429
421 if (expect_false (!mg)) 430 if (expect_false (!mg))
422 { 431 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 432
429 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
430 434
431 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
432 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
… …
450 GvSV (irsgv) = slot->irsgv; 454 GvSV (irsgv) = slot->irsgv;
451 455
452 #define VAR(name,type) PL_ ## name = slot->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
453 # include "state.h" 457 # include "state.h"
454 #undef VAR 458 #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 459
459 { 460 {
460 dSP; 461 dSP;
461 462
462 CV *cv; 463 CV *cv;
… …
591 592
592 New(54,PL_savestack,24,ANY); 593 New(54,PL_savestack,24,ANY);
593 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
594 PL_savestack_max = 24; 595 PL_savestack_max = 24;
595 596
596#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,10,0)
597 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
598 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
599 PL_retstack_max = 4; 600 PL_retstack_max = 4;
600#endif 601#endif
601} 602}
… …
624 625
625 Safefree (PL_tmps_stack); 626 Safefree (PL_tmps_stack);
626 Safefree (PL_markstack); 627 Safefree (PL_markstack);
627 Safefree (PL_scopestack); 628 Safefree (PL_scopestack);
628 Safefree (PL_savestack); 629 Safefree (PL_savestack);
629#if !PERL_VERSION_ATLEAST (5,9,0) 630#if !PERL_VERSION_ATLEAST (5,10,0)
630 Safefree (PL_retstack); 631 Safefree (PL_retstack);
631#endif 632#endif
632} 633}
633 634
634static size_t 635static size_t
… …
658 rss += slot->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
660 rss += slot->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
661 rss += slot->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
662 663
663#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,10,0)
664 rss += slot->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
665#endif 666#endif
666 } 667 }
667 668
668 return rss; 669 return rss;
669} 670}
670 671
671/** 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}
672 723
673static void 724static void
674coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
675{ 726{
676 /* 727 /*
… …
685 PL_curpm = 0; 736 PL_curpm = 0;
686 PL_curpad = 0; 737 PL_curpad = 0;
687 PL_localizing = 0; 738 PL_localizing = 0;
688 PL_dirty = 0; 739 PL_dirty = 0;
689 PL_restartop = 0; 740 PL_restartop = 0;
741#if PERL_VERSION_ATLEAST (5,10,0)
742 PL_parser = 0;
743#endif
744
745 /* recreate the die/warn hooks */
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0); 746 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); 747 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
692 748
693 GvSV (PL_defgv) = newSV (0); 749 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0; 750 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0); 751 GvSV (PL_errgv) = newSV (0);
696 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);
… …
847 SAVETMPS; 903 SAVETMPS;
848 EXTEND (SP, 3); 904 EXTEND (SP, 3);
849 PUSHMARK (SP); 905 PUSHMARK (SP);
850 PUSHs (&PL_sv_yes); 906 PUSHs (&PL_sv_yes);
851 PUSHs (fullname); 907 PUSHs (fullname);
852 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);
853 PUTBACK; 909 PUTBACK;
854 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 910 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); 911 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
856 SPAGAIN; 912 SPAGAIN;
857 FREETMPS; 913 FREETMPS;
… …
1073 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");
1074 1130
1075 if (expect_false (next->flags & CF_DESTROYED)) 1131 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"); 1132 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1077 1133
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0) 1134#if !PERL_VERSION_ATLEAST (5,10,0)
1080 expect_false (PL_parser)
1081#else
1082 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 if (expect_false (PL_lex_state != LEX_NOTPARSING)
1083#endif
1084 )
1085 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
1086 } 1138 }
1087} 1139}
1088 1140
1089/* always use the TRANSFER macro */ 1141/* always use the TRANSFER macro */
1090static void NOINLINE 1142static void NOINLINE
1091transfer (pTHX_ struct coro *prev, struct coro *next) 1143transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1092{ 1144{
1093 dSTACKLEVEL; 1145 dSTACKLEVEL;
1146 static volatile int has_throw;
1094 1147
1095 /* sometimes transfer is only called to set idle_sp */ 1148 /* sometimes transfer is only called to set idle_sp */
1096 if (expect_false (!next)) 1149 if (expect_false (!next))
1097 { 1150 {
1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1151 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1113 prev->flags &= ~CF_RUNNING; 1166 prev->flags &= ~CF_RUNNING;
1114 next->flags |= CF_RUNNING; 1167 next->flags |= CF_RUNNING;
1115 1168
1116 LOCK; 1169 LOCK;
1117 1170
1171 /* first get rid of the old state */
1172 save_perl (aTHX_ prev);
1173
1118 if (expect_false (next->flags & CF_NEW)) 1174 if (expect_false (next->flags & CF_NEW))
1119 { 1175 {
1120 /* need to start coroutine */ 1176 /* need to start coroutine */
1121 next->flags &= ~CF_NEW; 1177 next->flags &= ~CF_NEW;
1122 /* first get rid of the old state */
1123 save_perl (aTHX_ prev);
1124 /* setup coroutine call */ 1178 /* setup coroutine call */
1125 coro_setup (aTHX_ next); 1179 coro_setup (aTHX_ next);
1126 } 1180 }
1127 else 1181 else
1128 {
1129 /* coroutine already started */
1130 save_perl (aTHX_ prev);
1131 load_perl (aTHX_ next); 1182 load_perl (aTHX_ next);
1132 }
1133 1183
1134 prev__cctx = prev->cctx; 1184 prev__cctx = prev->cctx;
1135 1185
1136 /* possibly "free" the cctx */ 1186 /* possibly "free" the cctx */
1137 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 ))
1138 { 1192 {
1139 /* 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 */
1140 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));
1141 1195
1142 prev->cctx = 0; 1196 prev->cctx = 0;
… …
1152 1206
1153 ++next->usecount; 1207 ++next->usecount;
1154 1208
1155 if (expect_true (!next->cctx)) 1209 if (expect_true (!next->cctx))
1156 next->cctx = cctx_get (aTHX); 1210 next->cctx = cctx_get (aTHX);
1211
1212 has_throw = !!next->throw;
1157 1213
1158 if (expect_false (prev__cctx != next->cctx)) 1214 if (expect_false (prev__cctx != next->cctx))
1159 { 1215 {
1160 prev__cctx->top_env = PL_top_env; 1216 prev__cctx->top_env = PL_top_env;
1161 PL_top_env = next->cctx->top_env; 1217 PL_top_env = next->cctx->top_env;
… …
1163 } 1219 }
1164 1220
1165 free_coro_mortal (aTHX); 1221 free_coro_mortal (aTHX);
1166 UNLOCK; 1222 UNLOCK;
1167 1223
1168 if (expect_false (prev->throw || next->throw)) 1224 if (expect_false (has_throw))
1169 { 1225 {
1170 struct coro *coro = SvSTATE (coro_current); 1226 struct coro *coro = SvSTATE (coro_current);
1171 1227
1172 if (coro->throw) 1228 if (coro->throw)
1173 { 1229 {
… …
1183struct transfer_args 1239struct transfer_args
1184{ 1240{
1185 struct coro *prev, *next; 1241 struct coro *prev, *next;
1186}; 1242};
1187 1243
1188#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1244#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) 1245#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1190 1246
1191/** high level stuff ********************************************************/ 1247/** high level stuff ********************************************************/
1192 1248
1193static int 1249static int
… …
1287{ 1343{
1288 dTHX; 1344 dTHX;
1289 struct transfer_args ta; 1345 struct transfer_args ta;
1290 1346
1291 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1347 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1292 TRANSFER (ta); 1348 TRANSFER (ta, 1);
1293} 1349}
1294 1350
1295/** Coro ********************************************************************/ 1351/** Coro ********************************************************************/
1296 1352
1297static void 1353static void
… …
1299{ 1355{
1300 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);
1301} 1357}
1302 1358
1303static SV * 1359static SV *
1304coro_deq (pTHX_ int min_prio) 1360coro_deq (pTHX)
1305{ 1361{
1306 int prio = PRIO_MAX - PRIO_MIN; 1362 int prio;
1307 1363
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; ) 1364 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1313 if (AvFILLp (coro_ready [prio]) >= 0) 1365 if (AvFILLp (coro_ready [prio]) >= 0)
1314 return av_shift (coro_ready [prio]); 1366 return av_shift (coro_ready [prio]);
1315 1367
1316 return 0; 1368 return 0;
1317} 1369}
… …
1353 SV *prev_sv, *next_sv; 1405 SV *prev_sv, *next_sv;
1354 1406
1355 for (;;) 1407 for (;;)
1356 { 1408 {
1357 LOCK; 1409 LOCK;
1358 next_sv = coro_deq (aTHX_ PRIO_MIN); 1410 next_sv = coro_deq (aTHX);
1359 1411
1360 /* nothing to schedule: call the idle handler */ 1412 /* nothing to schedule: call the idle handler */
1361 if (expect_false (!next_sv)) 1413 if (expect_false (!next_sv))
1362 { 1414 {
1363 dSP; 1415 dSP;
… …
1367 SAVETMPS; 1419 SAVETMPS;
1368 1420
1369 PUSHMARK (SP); 1421 PUSHMARK (SP);
1370 PUTBACK; 1422 PUTBACK;
1371 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1423 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1424 SPAGAIN;
1372 1425
1373 FREETMPS; 1426 FREETMPS;
1374 LEAVE; 1427 LEAVE;
1375 continue; 1428 continue;
1376 } 1429 }
… …
1431{ 1484{
1432 dTHX; 1485 dTHX;
1433 struct transfer_args ta; 1486 struct transfer_args ta;
1434 1487
1435 prepare_schedule (aTHX_ &ta); 1488 prepare_schedule (aTHX_ &ta);
1436 TRANSFER (ta); 1489 TRANSFER (ta, 1);
1437} 1490}
1438 1491
1439static int 1492static int
1440api_cede (void) 1493api_cede (void)
1441{ 1494{
… …
1444 1497
1445 prepare_cede (aTHX_ &ta); 1498 prepare_cede (aTHX_ &ta);
1446 1499
1447 if (expect_true (ta.prev != ta.next)) 1500 if (expect_true (ta.prev != ta.next))
1448 { 1501 {
1449 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1450 return 1; 1503 return 1;
1451 } 1504 }
1452 else 1505 else
1453 return 0; 1506 return 0;
1454} 1507}
… …
1459 dTHX; 1512 dTHX;
1460 struct transfer_args ta; 1513 struct transfer_args ta;
1461 1514
1462 if (prepare_cede_notself (aTHX_ &ta)) 1515 if (prepare_cede_notself (aTHX_ &ta))
1463 { 1516 {
1464 TRANSFER (ta); 1517 TRANSFER (ta, 1);
1465 return 1; 1518 return 1;
1466 } 1519 }
1467 else 1520 else
1468 return 0; 1521 return 0;
1469} 1522}
… …
1506 BOOT_PAGESIZE; 1559 BOOT_PAGESIZE;
1507 1560
1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1561 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1562 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510 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
1511 hv_sig = coro_get_hv ("SIG", TRUE); 1569 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1512 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1570 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1513 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1571 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 1572
1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1573 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1519 1574
1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1575 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1576 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1538SV * 1593SV *
1539new (char *klass, ...) 1594new (char *klass, ...)
1540 CODE: 1595 CODE:
1541{ 1596{
1542 struct coro *coro; 1597 struct coro *coro;
1598 MAGIC *mg;
1543 HV *hv; 1599 HV *hv;
1544 int i; 1600 int i;
1545 1601
1546 Newz (0, coro, 1, struct coro); 1602 Newz (0, coro, 1, struct coro);
1547 coro->args = newAV (); 1603 coro->args = newAV ();
… …
1550 if (coro_first) coro_first->prev = coro; 1606 if (coro_first) coro_first->prev = coro;
1551 coro->next = coro_first; 1607 coro->next = coro_first;
1552 coro_first = coro; 1608 coro_first = coro;
1553 1609
1554 coro->hv = hv = newHV (); 1610 coro->hv = hv = newHV ();
1555 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;
1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1613 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1557 1614
1558 av_extend (coro->args, items - 1); 1615 av_extend (coro->args, items - 1);
1559 for (i = 1; i < items; i++) 1616 for (i = 1; i < items; i++)
1560 av_push (coro->args, newSVsv (ST (i))); 1617 av_push (coro->args, newSVsv (ST (i)));
… …
1574 Coro::cede_notself = 4 1631 Coro::cede_notself = 4
1575 CODE: 1632 CODE:
1576{ 1633{
1577 struct transfer_args ta; 1634 struct transfer_args ta;
1578 1635
1636 PUTBACK;
1579 switch (ix) 1637 switch (ix)
1580 { 1638 {
1581 case 0: 1639 case 0:
1582 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1640 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1583 ta.next = 0; 1641 ta.next = 0;
… …
1602 if (!prepare_cede_notself (aTHX_ &ta)) 1660 if (!prepare_cede_notself (aTHX_ &ta))
1603 XSRETURN_EMPTY; 1661 XSRETURN_EMPTY;
1604 1662
1605 break; 1663 break;
1606 } 1664 }
1665 SPAGAIN;
1607 1666
1608 BARRIER; 1667 BARRIER;
1609 PUTBACK; 1668 PUTBACK;
1610 TRANSFER (ta); 1669 TRANSFER (ta, 0);
1611 SPAGAIN; /* might be the sp of a different coroutine now */ 1670 SPAGAIN; /* might be the sp of a different coroutine now */
1612 /* be extra careful not to ever do anything after TRANSFER */ 1671 /* be extra careful not to ever do anything after TRANSFER */
1613} 1672}
1614 1673
1615bool 1674bool
… …
1669 { 1728 {
1670 struct coro temp; 1729 struct coro temp;
1671 1730
1672 if (!(coro->flags & CF_RUNNING)) 1731 if (!(coro->flags & CF_RUNNING))
1673 { 1732 {
1733 PUTBACK;
1674 save_perl (aTHX_ &temp); 1734 save_perl (aTHX_ &temp);
1675 load_perl (aTHX_ coro); 1735 load_perl (aTHX_ coro);
1676 } 1736 }
1677 1737
1678 { 1738 {
… …
1697 1757
1698 if (!(coro->flags & CF_RUNNING)) 1758 if (!(coro->flags & CF_RUNNING))
1699 { 1759 {
1700 save_perl (aTHX_ coro); 1760 save_perl (aTHX_ coro);
1701 load_perl (aTHX_ &temp); 1761 load_perl (aTHX_ &temp);
1762 SPAGAIN;
1702 } 1763 }
1703 } 1764 }
1704} 1765}
1705 1766
1706SV * 1767SV *
… …
1747 case 1: RETVAL = coro->usecount; break; 1808 case 1: RETVAL = coro->usecount; break;
1748 } 1809 }
1749 OUTPUT: 1810 OUTPUT:
1750 RETVAL 1811 RETVAL
1751 1812
1813void
1814force_cctx ()
1815 CODE:
1816 struct coro *coro = SvSTATE (coro_current);
1817 coro->cctx->idle_sp = 0;
1752 1818
1753MODULE = Coro::State PACKAGE = Coro 1819MODULE = Coro::State PACKAGE = Coro
1754 1820
1755BOOT: 1821BOOT:
1756{ 1822{
1757 int i; 1823 int i;
1758 1824
1759 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1825 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1760 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1826 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1761 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1827 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1762 1828
1763 coro_current = coro_get_sv ("Coro::current", FALSE); 1829 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1764 SvREADONLY_on (coro_current); 1830 SvREADONLY_on (coro_current);
1765 1831
1766 coro_stash = gv_stashpv ("Coro", TRUE); 1832 coro_stash = gv_stashpv ("Coro", TRUE);
1767 1833
1768 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1834 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1843 PROTOTYPE: $;$ 1909 PROTOTYPE: $;$
1844 CODE: 1910 CODE:
1845 SvREFCNT_dec (self->throw); 1911 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1912 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847 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
1848# for async_pool speedup 1930# for async_pool speedup
1849void 1931void
1850_pool_1 (SV *cb) 1932_pool_1 (SV *cb)
1851 CODE: 1933 CODE:
1852{ 1934{
… …
1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1938 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1857 AV *invoke_av; 1939 AV *invoke_av;
1858 int i, len; 1940 int i, len;
1859 1941
1860 if (!invoke) 1942 if (!invoke)
1943 {
1944 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1861 croak ("\3async_pool terminate\2\n"); 1945 croak ("\3async_pool terminate\2\n");
1946 }
1862 1947
1863 SvREFCNT_dec (coro->saved_deffh); 1948 SvREFCNT_dec (coro->saved_deffh);
1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1949 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1865 1950
1866 hv_store (hv, "desc", sizeof ("desc") - 1, 1951 hv_store (hv, "desc", sizeof ("desc") - 1,
… …
1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1977 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1893 coro->saved_deffh = 0; 1978 coro->saved_deffh = 0;
1894 1979
1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1980 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1896 || 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;
1897 croak ("\3async_pool terminate\2\n"); 1984 croak ("\3async_pool terminate\2\n");
1985 }
1898 1986
1899 av_clear (GvAV (PL_defgv)); 1987 av_clear (GvAV (PL_defgv));
1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1988 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1989 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1902 1990

Diff Legend

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