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.209 by root, Wed Oct 10 02:58:17 2007 UTC vs.
Revision 1.228 by root, Sun Apr 6 17:51:15 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
… …
131#else 136#else
132# define LOCK (void)0 137# define LOCK (void)0
133# define UNLOCK (void)0 138# define UNLOCK (void)0
134#endif 139#endif
135 140
136#define strpair(const) const, sizeof (const) - 1
137
138/* helper storage struct for Coro::AIO */ 141/* helper storage struct for Coro::AIO */
139struct io_state 142struct io_state
140{ 143{
141 int errorno; 144 int errorno;
142 I32 laststype; 145 I32 laststype;
… …
147static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
148static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
149static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env; 153static JMPENV *main_top_env;
151static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
152static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
153 156
154static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
156 159static SV *rv_diehook;
160static SV *rv_warnhook;
157static HV *hv_sig; /* %SIG */ 161static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160 162
161/* async_pool helper stuff */ 163/* async_pool helper stuff */
162static SV *sv_pool_rss; 164static SV *sv_pool_rss;
163static SV *sv_pool_size; 165static SV *sv_pool_size;
164static AV *av_async_pool; 166static AV *av_async_pool;
165 167
166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */ 168static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle[3]; 169static int cctx_count, cctx_idle;
168 170
169enum { 171enum {
170 CC_MAPPED = 0x01, 172 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 173 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 174 CC_TRACE = 0x04,
… …
217 219
218/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
219struct coro { 221struct coro {
220 /* the c coroutine allocated to this perl coroutine, if any */ 222 /* the c coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 223 coro_cctx *cctx;
222 int gimme;
223 224
224 /* process data */ 225 /* process data */
225 AV *mainstack; 226 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */ 227 perl_slots *slot; /* basically the saved sp */
227 228
… …
263static struct coro *coro_first; 264static struct coro *coro_first;
264 265
265/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
266 267
267static SV * 268static SV *
268coro_get_sv (const char *name, int create) 269coro_get_sv (pTHX_ const char *name, int create)
269{ 270{
270#if PERL_VERSION_ATLEAST (5,9,0) 271#if PERL_VERSION_ATLEAST (5,10,0)
271 /* 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 */
272 get_sv (name, create); 273 get_sv (name, create);
273#endif 274#endif
274 return get_sv (name, create); 275 return get_sv (name, create);
275} 276}
276 277
277static AV * 278static AV *
278coro_get_av (const char *name, int create) 279coro_get_av (pTHX_ const char *name, int create)
279{ 280{
280#if PERL_VERSION_ATLEAST (5,9,0) 281#if PERL_VERSION_ATLEAST (5,10,0)
281 /* 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 */
282 get_av (name, create); 283 get_av (name, create);
283#endif 284#endif
284 return get_av (name, create); 285 return get_av (name, create);
285} 286}
286 287
287static HV * 288static HV *
288coro_get_hv (const char *name, int create) 289coro_get_hv (pTHX_ const char *name, int create)
289{ 290{
290#if PERL_VERSION_ATLEAST (5,9,0) 291#if PERL_VERSION_ATLEAST (5,10,0)
291 /* 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 */
292 get_hv (name, create); 293 get_hv (name, create);
293#endif 294#endif
294 return get_hv (name, create); 295 return get_hv (name, create);
295} 296}
… …
300 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
301 AV *newpadlist, *newpad; 302 AV *newpadlist, *newpad;
302 303
303 newpadlist = newAV (); 304 newpadlist = newAV ();
304 AvREAL_off (newpadlist); 305 AvREAL_off (newpadlist);
305#if PERL_VERSION_ATLEAST (5,9,0) 306#if PERL_VERSION_ATLEAST (5,10,0)
306 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
307#else 308#else
308 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 309 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
309#endif 310#endif
310 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 311 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
… …
348 349
349 /* casting is fun. */ 350 /* casting is fun. */
350 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
351 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
352 353
353 SvREFCNT_dec (av);
354
355 return 0; 354 return 0;
356} 355}
357 356
358#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
359 359
360static 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};
361 364
362#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
363 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
364 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
365 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
366 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
367 : 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)
368 374
369static struct coro * 375static struct coro *
370SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
371{ 377{
372 HV *stash; 378 HV *stash;
… …
384 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
386 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
387 } 393 }
388 394
389 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
390 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
391} 397}
392 398
393#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
394 400
395/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
396static void 402static void
397get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
398{ 404{
399 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
400 AV *av; 406 AV *av;
401 407
402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
404 else 410 else
… …
416} 422}
417 423
418static void 424static void
419put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
420{ 426{
421 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
422 AV *av; 428 AV *av;
423 429
424 if (expect_false (!mg)) 430 if (expect_false (!mg))
425 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
428 mg->mg_virtual = &vtbl_coro;
429 mg->mg_obj = (SV *)newAV ();
430 }
431 432
432 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
433 434
434 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
435 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
… …
453 GvSV (irsgv) = slot->irsgv; 454 GvSV (irsgv) = slot->irsgv;
454 455
455 #define VAR(name,type) PL_ ## name = slot->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
456 # include "state.h" 457 # include "state.h"
457 #undef VAR 458 #undef VAR
458
459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
461 459
462 { 460 {
463 dSP; 461 dSP;
464 462
465 CV *cv; 463 CV *cv;
… …
594 592
595 New(54,PL_savestack,24,ANY); 593 New(54,PL_savestack,24,ANY);
596 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
597 PL_savestack_max = 24; 595 PL_savestack_max = 24;
598 596
599#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,10,0)
600 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
601 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
602 PL_retstack_max = 4; 600 PL_retstack_max = 4;
603#endif 601#endif
604} 602}
… …
627 625
628 Safefree (PL_tmps_stack); 626 Safefree (PL_tmps_stack);
629 Safefree (PL_markstack); 627 Safefree (PL_markstack);
630 Safefree (PL_scopestack); 628 Safefree (PL_scopestack);
631 Safefree (PL_savestack); 629 Safefree (PL_savestack);
632#if !PERL_VERSION_ATLEAST (5,9,0) 630#if !PERL_VERSION_ATLEAST (5,10,0)
633 Safefree (PL_retstack); 631 Safefree (PL_retstack);
634#endif 632#endif
635} 633}
636 634
637static size_t 635static size_t
… …
661 rss += slot->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
663 rss += slot->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
664 rss += slot->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
665 663
666#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,10,0)
667 rss += slot->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
668#endif 666#endif
669 } 667 }
670 668
671 return rss; 669 return rss;
672} 670}
673 671
674/** 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}
675 723
676static void 724static void
677coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
678{ 726{
679 /* 727 /*
… …
688 PL_curpm = 0; 736 PL_curpm = 0;
689 PL_curpad = 0; 737 PL_curpad = 0;
690 PL_localizing = 0; 738 PL_localizing = 0;
691 PL_dirty = 0; 739 PL_dirty = 0;
692 PL_restartop = 0; 740 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 741#if !PERL_VERSION_ATLEAST (5,10,0)
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 742 PL_parser = 0;
743#endif
744
745 /* recreate the die/warn hooks */
746 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
747 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
695 748
696 GvSV (PL_defgv) = newSV (0); 749 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0; 750 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0); 751 GvSV (PL_errgv) = newSV (0);
699 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 752 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 765 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
713 PUTBACK; 766 PUTBACK;
714 PL_op = (OP *)&myop; 767 PL_op = (OP *)&myop;
715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 768 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
716 SPAGAIN; 769 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
731 } 770 }
771
772 /* this newly created coroutine might be run on an existing cctx which most
773 * likely was suspended in set_stacklevel, called from entersub.
774 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
775 * so we ENTER here for symmetry
776 */
777 ENTER;
732} 778}
733 779
734static void 780static void
735coro_destroy (pTHX_ struct coro *coro) 781coro_destroy (pTHX_ struct coro *coro)
736{ 782{
… …
820 PUSHMARK (SP); 866 PUSHMARK (SP);
821 PUSHs (&PL_sv_no); 867 PUSHs (&PL_sv_no);
822 PUSHs (fullname); 868 PUSHs (fullname);
823 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 869 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
824 PUTBACK; 870 PUTBACK;
825 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 871 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
826 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 872 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
827 SPAGAIN; 873 SPAGAIN;
828 FREETMPS; 874 FREETMPS;
829 LEAVE; 875 LEAVE;
830 PL_runops = runops_trace; 876 PL_runops = runops_trace;
… …
857 SAVETMPS; 903 SAVETMPS;
858 EXTEND (SP, 3); 904 EXTEND (SP, 3);
859 PUSHMARK (SP); 905 PUSHMARK (SP);
860 PUSHs (&PL_sv_yes); 906 PUSHs (&PL_sv_yes);
861 PUSHs (fullname); 907 PUSHs (fullname);
862 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);
863 PUTBACK; 909 PUTBACK;
864 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 910 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
865 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);
866 SPAGAIN; 912 SPAGAIN;
867 FREETMPS; 913 FREETMPS;
868 LEAVE; 914 LEAVE;
869 PL_runops = runops_trace; 915 PL_runops = runops_trace;
… …
883 PL_runops = RUNOPS_DEFAULT; 929 PL_runops = RUNOPS_DEFAULT;
884 PUSHMARK (SP); 930 PUSHMARK (SP);
885 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 931 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
886 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 932 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
887 PUTBACK; 933 PUTBACK;
888 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 934 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
889 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 935 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
890 SPAGAIN; 936 SPAGAIN;
891 FREETMPS; 937 FREETMPS;
892 LEAVE; 938 LEAVE;
893 PL_runops = runops_trace; 939 PL_runops = runops_trace;
… …
1032 1078
1033/* wether this cctx should be destructed */ 1079/* wether this cctx should be destructed */
1034#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1080#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1035 1081
1036static coro_cctx * 1082static coro_cctx *
1037cctx_get (pTHX_ int gimme) 1083cctx_get (pTHX)
1038{ 1084{
1039 while (expect_true (cctx_first[gimme])) 1085 while (expect_true (cctx_first))
1040 { 1086 {
1041 coro_cctx *cctx = cctx_first[gimme]; 1087 coro_cctx *cctx = cctx_first;
1042 cctx_first[gimme] = cctx->next; 1088 cctx_first = cctx->next;
1043 --cctx_idle[gimme]; 1089 --cctx_idle;
1044 1090
1045 if (expect_true (!CCTX_EXPIRED (cctx))) 1091 if (expect_true (!CCTX_EXPIRED (cctx)))
1046 return cctx; 1092 return cctx;
1047 1093
1048 cctx_destroy (cctx); 1094 cctx_destroy (cctx);
1049 } 1095 }
1050 1096
1051 assert (!gimme);
1052 return cctx_new (); 1097 return cctx_new ();
1053} 1098}
1054 1099
1055static void 1100static void
1056cctx_put (coro_cctx *cctx, int gimme) 1101cctx_put (coro_cctx *cctx)
1057{ 1102{
1058 /* free another cctx if overlimit */ 1103 /* free another cctx if overlimit */
1059 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX)) 1104 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
1060 { 1105 {
1061 coro_cctx *first = cctx_first[gimme]; 1106 coro_cctx *first = cctx_first;
1062 cctx_first[gimme] = first->next; 1107 cctx_first = first->next;
1063 --cctx_idle[gimme]; 1108 --cctx_idle;
1064 1109
1065 cctx_destroy (first); 1110 cctx_destroy (first);
1066 } 1111 }
1067 1112
1068 ++cctx_idle[gimme]; 1113 ++cctx_idle;
1069 cctx->next = cctx_first[gimme]; 1114 cctx->next = cctx_first;
1070 cctx_first[gimme] = cctx; 1115 cctx_first = cctx;
1071} 1116}
1072 1117
1073/** coroutine switching *****************************************************/ 1118/** coroutine switching *****************************************************/
1074 1119
1075static void 1120static void
… …
1084 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");
1085 1130
1086 if (expect_false (next->flags & CF_DESTROYED)) 1131 if (expect_false (next->flags & CF_DESTROYED))
1087 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");
1088 1133
1089 if (
1090#if PERL_VERSION_ATLEAST (5,9,0) 1134#if !PERL_VERSION_ATLEAST (5,10,0)
1091 expect_false (PL_parser)
1092#else
1093 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 if (expect_false (PL_lex_state != LEX_NOTPARSING)
1094#endif
1095 )
1096 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");
1137#endif
1097 } 1138 }
1098} 1139}
1099 1140
1100/* always use the TRANSFER macro */ 1141/* always use the TRANSFER macro */
1101static void NOINLINE 1142static void NOINLINE
1102transfer (pTHX_ struct coro *prev, struct coro *next) 1143transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1103{ 1144{
1104 dSTACKLEVEL; 1145 dSTACKLEVEL;
1146 static volatile int has_throw;
1105 1147
1106 /* sometimes transfer is only called to set idle_sp */ 1148 /* sometimes transfer is only called to set idle_sp */
1107 if (expect_false (!next)) 1149 if (expect_false (!next))
1108 { 1150 {
1109 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1151 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1124 prev->flags &= ~CF_RUNNING; 1166 prev->flags &= ~CF_RUNNING;
1125 next->flags |= CF_RUNNING; 1167 next->flags |= CF_RUNNING;
1126 1168
1127 LOCK; 1169 LOCK;
1128 1170
1171 /* first get rid of the old state */
1172 save_perl (aTHX_ prev);
1173
1129 if (expect_false (next->flags & CF_NEW)) 1174 if (expect_false (next->flags & CF_NEW))
1130 { 1175 {
1131 /* need to start coroutine */ 1176 /* need to start coroutine */
1132 next->flags &= ~CF_NEW; 1177 next->flags &= ~CF_NEW;
1133 /* first get rid of the old state */
1134 save_perl (aTHX_ prev);
1135 /* setup coroutine call */ 1178 /* setup coroutine call */
1136 coro_setup (aTHX_ next); 1179 coro_setup (aTHX_ next);
1137 } 1180 }
1138 else 1181 else
1139 {
1140 /* coroutine already started */
1141 save_perl (aTHX_ prev);
1142 load_perl (aTHX_ next); 1182 load_perl (aTHX_ next);
1143 }
1144 1183
1145 prev__cctx = prev->cctx; 1184 prev__cctx = prev->cctx;
1146 1185
1147 /* possibly "free" the cctx */ 1186 /* possibly "free" the cctx */
1148 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 ))
1149 { 1192 {
1150 /* 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 */
1151 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));
1152 1195
1153 prev->cctx = 0; 1196 prev->cctx = 0;
1154 1197
1155 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1198 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1156 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1199 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1157 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1200 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1158 if (!next->cctx) 1201 if (!next->cctx)
1159 next->cctx = cctx_get (aTHX_ next->gimme); 1202 next->cctx = cctx_get (aTHX);
1160 1203
1161 cctx_put (prev__cctx, prev->gimme); 1204 cctx_put (prev__cctx);
1162 } 1205 }
1163 1206
1164 ++next->usecount; 1207 ++next->usecount;
1165 1208
1166 if (expect_true (!next->cctx)) 1209 if (expect_true (!next->cctx))
1167 next->cctx = cctx_get (aTHX_ next->gimme); 1210 next->cctx = cctx_get (aTHX);
1211
1212 has_throw = !!next->throw;
1168 1213
1169 if (expect_false (prev__cctx != next->cctx)) 1214 if (expect_false (prev__cctx != next->cctx))
1170 { 1215 {
1171 prev__cctx->top_env = PL_top_env; 1216 prev__cctx->top_env = PL_top_env;
1172 PL_top_env = next->cctx->top_env; 1217 PL_top_env = next->cctx->top_env;
… …
1174 } 1219 }
1175 1220
1176 free_coro_mortal (aTHX); 1221 free_coro_mortal (aTHX);
1177 UNLOCK; 1222 UNLOCK;
1178 1223
1179 if (expect_false (prev->throw || next->throw)) 1224 if (expect_false (has_throw))
1180 { 1225 {
1181 struct coro *coro = SvSTATE (coro_current); 1226 struct coro *coro = SvSTATE (coro_current);
1182 1227
1183 if (coro->throw) 1228 if (coro->throw)
1184 { 1229 {
… …
1194struct transfer_args 1239struct transfer_args
1195{ 1240{
1196 struct coro *prev, *next; 1241 struct coro *prev, *next;
1197}; 1242};
1198 1243
1199#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1244#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1200#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1245#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1201 1246
1202/** high level stuff ********************************************************/ 1247/** high level stuff ********************************************************/
1203 1248
1204static int 1249static int
… …
1298{ 1343{
1299 dTHX; 1344 dTHX;
1300 struct transfer_args ta; 1345 struct transfer_args ta;
1301 1346
1302 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1347 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1303 TRANSFER (ta); 1348 TRANSFER (ta, 1);
1304} 1349}
1305 1350
1306/** Coro ********************************************************************/ 1351/** Coro ********************************************************************/
1307 1352
1308static void 1353static void
… …
1310{ 1355{
1311 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);
1312} 1357}
1313 1358
1314static SV * 1359static SV *
1315coro_deq (pTHX_ int min_prio) 1360coro_deq (pTHX)
1316{ 1361{
1317 int prio = PRIO_MAX - PRIO_MIN; 1362 int prio;
1318 1363
1319 min_prio -= PRIO_MIN;
1320 if (min_prio < 0)
1321 min_prio = 0;
1322
1323 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1364 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1324 if (AvFILLp (coro_ready [prio]) >= 0) 1365 if (AvFILLp (coro_ready [prio]) >= 0)
1325 return av_shift (coro_ready [prio]); 1366 return av_shift (coro_ready [prio]);
1326 1367
1327 return 0; 1368 return 0;
1328} 1369}
… …
1364 SV *prev_sv, *next_sv; 1405 SV *prev_sv, *next_sv;
1365 1406
1366 for (;;) 1407 for (;;)
1367 { 1408 {
1368 LOCK; 1409 LOCK;
1369 next_sv = coro_deq (aTHX_ PRIO_MIN); 1410 next_sv = coro_deq (aTHX);
1370 1411
1371 /* nothing to schedule: call the idle handler */ 1412 /* nothing to schedule: call the idle handler */
1372 if (expect_false (!next_sv)) 1413 if (expect_false (!next_sv))
1373 { 1414 {
1374 dSP; 1415 dSP;
… …
1378 SAVETMPS; 1419 SAVETMPS;
1379 1420
1380 PUSHMARK (SP); 1421 PUSHMARK (SP);
1381 PUTBACK; 1422 PUTBACK;
1382 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1423 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1424 SPAGAIN;
1383 1425
1384 FREETMPS; 1426 FREETMPS;
1385 LEAVE; 1427 LEAVE;
1386 continue; 1428 continue;
1387 } 1429 }
… …
1442{ 1484{
1443 dTHX; 1485 dTHX;
1444 struct transfer_args ta; 1486 struct transfer_args ta;
1445 1487
1446 prepare_schedule (aTHX_ &ta); 1488 prepare_schedule (aTHX_ &ta);
1447 TRANSFER (ta); 1489 TRANSFER (ta, 1);
1448} 1490}
1449 1491
1450static int 1492static int
1451api_cede (void) 1493api_cede (void)
1452{ 1494{
… …
1455 1497
1456 prepare_cede (aTHX_ &ta); 1498 prepare_cede (aTHX_ &ta);
1457 1499
1458 if (expect_true (ta.prev != ta.next)) 1500 if (expect_true (ta.prev != ta.next))
1459 { 1501 {
1460 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1461 return 1; 1503 return 1;
1462 } 1504 }
1463 else 1505 else
1464 return 0; 1506 return 0;
1465} 1507}
… …
1470 dTHX; 1512 dTHX;
1471 struct transfer_args ta; 1513 struct transfer_args ta;
1472 1514
1473 if (prepare_cede_notself (aTHX_ &ta)) 1515 if (prepare_cede_notself (aTHX_ &ta))
1474 { 1516 {
1475 TRANSFER (ta); 1517 TRANSFER (ta, 1);
1476 return 1; 1518 return 1;
1477 } 1519 }
1478 else 1520 else
1479 return 0; 1521 return 0;
1480} 1522}
… …
1517 BOOT_PAGESIZE; 1559 BOOT_PAGESIZE;
1518 1560
1519 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1561 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1520 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1562 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1521 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
1522 hv_sig = coro_get_hv ("SIG", TRUE); 1569 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1523 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1570 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1524 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1571 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1525
1526 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1527 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1528 1572
1529 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1573 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1530 1574
1531 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1575 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1532 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1576 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1538 1582
1539 while (main_top_env->je_prev) 1583 while (main_top_env->je_prev)
1540 main_top_env = main_top_env->je_prev; 1584 main_top_env = main_top_env->je_prev;
1541 1585
1542 coroapi.ver = CORO_API_VERSION; 1586 coroapi.ver = CORO_API_VERSION;
1587 coroapi.rev = CORO_API_REVISION;
1543 coroapi.transfer = api_transfer; 1588 coroapi.transfer = api_transfer;
1544 1589
1545 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1590 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1546} 1591}
1547 1592
1548SV * 1593SV *
1549new (char *klass, ...) 1594new (char *klass, ...)
1550 CODE: 1595 CODE:
1551{ 1596{
1552 struct coro *coro; 1597 struct coro *coro;
1598 MAGIC *mg;
1553 HV *hv; 1599 HV *hv;
1554 int i; 1600 int i;
1555 1601
1556 Newz (0, coro, 1, struct coro); 1602 Newz (0, coro, 1, struct coro);
1557 coro->args = newAV (); 1603 coro->args = newAV ();
… …
1560 if (coro_first) coro_first->prev = coro; 1606 if (coro_first) coro_first->prev = coro;
1561 coro->next = coro_first; 1607 coro->next = coro_first;
1562 coro_first = coro; 1608 coro_first = coro;
1563 1609
1564 coro->hv = hv = newHV (); 1610 coro->hv = hv = newHV ();
1565 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;
1566 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1613 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1567 1614
1568 av_extend (coro->args, items - 1); 1615 av_extend (coro->args, items - 1);
1569 for (i = 1; i < items; i++) 1616 for (i = 1; i < items; i++)
1570 av_push (coro->args, newSVsv (ST (i))); 1617 av_push (coro->args, newSVsv (ST (i)));
… …
1576# function to increase chances that they all will call transfer with the same 1623# function to increase chances that they all will call transfer with the same
1577# stack offset 1624# stack offset
1578void 1625void
1579_set_stacklevel (...) 1626_set_stacklevel (...)
1580 ALIAS: 1627 ALIAS:
1581 Coro::State::transfer = 1 1628 Coro::State::transfer = 1
1582 Coro::schedule = 2 1629 Coro::schedule = 2
1583 Coro::cede = 3 1630 Coro::cede = 3
1584 Coro::cede_notself = 4 1631 Coro::cede_notself = 4
1585 Coro::Event::next = 5
1586 Coro::Event::next_cancel = 6
1587 PPCODE: 1632 CODE:
1588{ 1633{
1589 struct transfer_args ta; 1634 struct transfer_args ta;
1590 int again = 0;
1591 1635
1592 do 1636 PUTBACK;
1637 switch (ix)
1593 { 1638 {
1594 switch (ix)
1595 {
1596 case 0: 1639 case 0:
1597 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1640 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1598 ta.next = 0; 1641 ta.next = 0;
1599 break; 1642 break;
1600 1643
1601 case 1: 1644 case 1:
1602 if (items != 2) 1645 if (items != 2)
1603 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1646 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1604 1647
1605 prepare_transfer (aTHX_ &ta, ST(0), ST(1)); 1648 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1606 break; 1649 break;
1607 1650
1608 case 2: 1651 case 2:
1609 prepare_schedule (aTHX_ &ta); 1652 prepare_schedule (aTHX_ &ta);
1610 break; 1653 break;
1611 1654
1612 case 3: 1655 case 3:
1613 prepare_cede (aTHX_ &ta); 1656 prepare_cede (aTHX_ &ta);
1614 break; 1657 break;
1615 1658
1616 case 4: 1659 case 4:
1617 if (!prepare_cede_notself (aTHX_ &ta)) 1660 if (!prepare_cede_notself (aTHX_ &ta))
1618 XSRETURN_EMPTY; 1661 XSRETURN_EMPTY;
1619 1662
1620 break; 1663 break;
1621
1622 case 5:
1623 case 6:
1624 if (items != 1)
1625 croak ("Coro::Event::next (watcher) expects one argument, not %d", items);
1626
1627 {
1628 SV *ev = coroapi.coro_event_next (ST (0), ix == 6, GIMME_V != G_VOID);
1629
1630 if (ev)
1631 {
1632 if (GIMME_V != G_VOID)
1633 {
1634 XPUSHs (ev);
1635 XSRETURN (1);
1636 }
1637 else
1638 XSRETURN_EMPTY;
1639 }
1640 }
1641
1642 prepare_schedule (aTHX_ &ta);
1643 again = 1;
1644 break;
1645 }
1646
1647 /* our caller, entersub, caches *only* this value */
1648 ta.prev->gimme = GIMME_V == G_VOID ? 0
1649 : GIMME_V == G_SCALAR ? 1
1650 : 2;
1651
1652 /* we need to save all local variables, as we might execute a different coroutine when transfer returns */
1653 sp += 2; /* save args */
1654 EXTEND (SP, 4);
1655 PUSHs ((SV *)(intptr_t)items);
1656 PUSHs ((SV *)(intptr_t)ix);
1657 PUSHs ((SV *)(intptr_t)ax);
1658 PUSHs ((SV *)(intptr_t)again);
1659 PUTBACK;
1660 BARRIER;
1661 TRANSFER (ta);
1662 BARRIER;
1663 SPAGAIN;
1664 again = (intptr_t)POPs;
1665 ax = (intptr_t)POPs;
1666 ix = (intptr_t)POPs;
1667 items = (intptr_t)POPs;
1668 sp -= 2; /* restore args */
1669 } 1664 }
1670 while (again); 1665 SPAGAIN;
1671 1666
1672 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1667 BARRIER;
1673 XSRETURN_YES; 1668 PUTBACK;
1674 1669 TRANSFER (ta, 0);
1675 XSRETURN_EMPTY; /* not understood why this is necessary, likely some stack handling bug */ 1670 SPAGAIN; /* might be the sp of a different coroutine now */
1671 /* be extra careful not to ever do anything after TRANSFER */
1676} 1672}
1677 1673
1678bool 1674bool
1679_destroy (SV *coro_sv) 1675_destroy (SV *coro_sv)
1680 CODE: 1676 CODE:
… …
1706 RETVAL 1702 RETVAL
1707 1703
1708int 1704int
1709cctx_idle () 1705cctx_idle ()
1710 CODE: 1706 CODE:
1711 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2]; 1707 RETVAL = cctx_idle;
1712 OUTPUT: 1708 OUTPUT:
1713 RETVAL 1709 RETVAL
1714 1710
1715void 1711void
1716list () 1712list ()
… …
1732 { 1728 {
1733 struct coro temp; 1729 struct coro temp;
1734 1730
1735 if (!(coro->flags & CF_RUNNING)) 1731 if (!(coro->flags & CF_RUNNING))
1736 { 1732 {
1733 PUTBACK;
1737 save_perl (aTHX_ &temp); 1734 save_perl (aTHX_ &temp);
1738 load_perl (aTHX_ coro); 1735 load_perl (aTHX_ coro);
1739 } 1736 }
1740 1737
1741 { 1738 {
… …
1750 eval_sv (coderef, 0); 1747 eval_sv (coderef, 0);
1751 else 1748 else
1752 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1749 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1753 1750
1754 POPSTACK; 1751 POPSTACK;
1752 SPAGAIN;
1755 FREETMPS; 1753 FREETMPS;
1756 LEAVE; 1754 LEAVE;
1755 PUTBACK;
1757 } 1756 }
1758 1757
1759 if (!(coro->flags & CF_RUNNING)) 1758 if (!(coro->flags & CF_RUNNING))
1760 { 1759 {
1761 save_perl (aTHX_ coro); 1760 save_perl (aTHX_ coro);
1762 load_perl (aTHX_ &temp); 1761 load_perl (aTHX_ &temp);
1762 SPAGAIN;
1763 } 1763 }
1764 } 1764 }
1765} 1765}
1766 1766
1767SV * 1767SV *
… …
1808 case 1: RETVAL = coro->usecount; break; 1808 case 1: RETVAL = coro->usecount; break;
1809 } 1809 }
1810 OUTPUT: 1810 OUTPUT:
1811 RETVAL 1811 RETVAL
1812 1812
1813void
1814force_cctx ()
1815 CODE:
1816 struct coro *coro = SvSTATE (coro_current);
1817 coro->cctx->idle_sp = 0;
1813 1818
1814MODULE = Coro::State PACKAGE = Coro 1819MODULE = Coro::State PACKAGE = Coro
1815 1820
1816BOOT: 1821BOOT:
1817{ 1822{
1818 int i; 1823 int i;
1819 1824
1820 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1825 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1821 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1826 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1822 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1827 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1823 1828
1824 coro_current = coro_get_sv ("Coro::current", FALSE); 1829 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1825 SvREADONLY_on (coro_current); 1830 SvREADONLY_on (coro_current);
1826 1831
1827 coro_stash = gv_stashpv ("Coro", TRUE); 1832 coro_stash = gv_stashpv ("Coro", TRUE);
1828 1833
1829 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1834 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1904 PROTOTYPE: $;$ 1909 PROTOTYPE: $;$
1905 CODE: 1910 CODE:
1906 SvREFCNT_dec (self->throw); 1911 SvREFCNT_dec (self->throw);
1907 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1912 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1908 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
1909# for async_pool speedup 1930# for async_pool speedup
1910void 1931void
1911_pool_1 (SV *cb) 1932_pool_1 (SV *cb)
1912 CODE: 1933 CODE:
1913{ 1934{
1914 struct coro *coro = SvSTATE (coro_current); 1935 struct coro *coro = SvSTATE (coro_current);
1915 HV *hv = (HV *)SvRV (coro_current); 1936 HV *hv = (HV *)SvRV (coro_current);
1916 AV *defav = GvAV (PL_defgv); 1937 AV *defav = GvAV (PL_defgv);
1917 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1938 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1918 AV *invoke_av; 1939 AV *invoke_av;
1919 int i, len; 1940 int i, len;
1920 1941
1921 if (!invoke) 1942 if (!invoke)
1943 {
1944 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1922 croak ("\3async_pool terminate\2\n"); 1945 croak ("\3async_pool terminate\2\n");
1946 }
1923 1947
1924 SvREFCNT_dec (coro->saved_deffh); 1948 SvREFCNT_dec (coro->saved_deffh);
1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1949 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1926 1950
1927 hv_store (hv, "desc", sizeof ("desc") - 1, 1951 hv_store (hv, "desc", sizeof ("desc") - 1,
1928 newSVpvn (strpair ("[async_pool]")), 0); 1952 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1929 1953
1930 invoke_av = (AV *)SvRV (invoke); 1954 invoke_av = (AV *)SvRV (invoke);
1931 len = av_len (invoke_av); 1955 len = av_len (invoke_av);
1932 1956
1933 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1957 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1953 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1977 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1954 coro->saved_deffh = 0; 1978 coro->saved_deffh = 0;
1955 1979
1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1980 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1957 || 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;
1958 croak ("\3async_pool terminate\2\n"); 1984 croak ("\3async_pool terminate\2\n");
1985 }
1959 1986
1960 av_clear (GvAV (PL_defgv)); 1987 av_clear (GvAV (PL_defgv));
1961 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1988 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1962 newSVpvn (strpair ("[async_pool idle]")), 0); 1989 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1963 1990
1964 coro->prio = 0; 1991 coro->prio = 0;
1965 1992
1966 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1993 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1967 api_trace (coro_current, 0); 1994 api_trace (coro_current, 0);

Diff Legend

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