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.201 by root, Mon Oct 8 01:23:14 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
22# include <inttypes.h> /* most portable stdint.h */
23#endif
15 24
16#ifdef HAVE_MMAP 25#ifdef HAVE_MMAP
17# include <unistd.h> 26# include <unistd.h>
18# include <sys/mman.h> 27# include <sys/mman.h>
19# ifndef MAP_ANONYMOUS 28# ifndef MAP_ANONYMOUS
71# ifndef IS_PADCONST 80# ifndef IS_PADCONST
72# define IS_PADCONST(v) 0 81# define IS_PADCONST(v) 0
73# endif 82# endif
74#endif 83#endif
75 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
76/* 5.8.7 */ 98/* 5.8.7 */
77#ifndef SvRV_set 99#ifndef SvRV_set
78# define SvRV_set(s,v) SvRV(s) = (v) 100# define SvRV_set(s,v) SvRV(s) = (v)
79#endif
80
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif 101#endif
88 102
89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 103#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
90# undef CORO_STACKGUARD 104# undef CORO_STACKGUARD
91#endif 105#endif
130#else 144#else
131# define LOCK (void)0 145# define LOCK (void)0
132# define UNLOCK (void)0 146# define UNLOCK (void)0
133#endif 147#endif
134 148
135#define strpair(const) const, sizeof (const) - 1
136
137/* helper storage struct for Coro::AIO */ 149/* helper storage struct for Coro::AIO */
138struct io_state 150struct io_state
139{ 151{
140 int errorno; 152 int errorno;
141 I32 laststype; 153 I32 laststype;
146static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
147static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
148static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
149static JMPENV *main_top_env; 161static JMPENV *main_top_env;
150static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
151static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
152 164
153static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
155 167static SV *rv_diehook;
168static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */ 169static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
159 170
160/* async_pool helper stuff */ 171/* async_pool helper stuff */
161static SV *sv_pool_rss; 172static SV *sv_pool_rss;
162static SV *sv_pool_size; 173static SV *sv_pool_size;
163static AV *av_async_pool; 174static AV *av_async_pool;
221 232
222 /* process data */ 233 /* process data */
223 AV *mainstack; 234 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */ 235 perl_slots *slot; /* basically the saved sp */
225 236
226 /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
227 AV *args; 238 int refcnt; /* coroutines are refcounted, yes */
228 int refcnt;
229 int flags; /* CF_ flags */ 239 int flags; /* CF_ flags */
240 HV *hv; /* the perl hash associated with this coro, if any */
230 241
231 /* statistics */ 242 /* statistics */
232 int usecount; /* number of transfers to this coro */ 243 int usecount; /* number of transfers to this coro */
233 244
234 /* coro process data */ 245 /* coro process data */
235 int prio; 246 int prio;
236 SV *throw; 247 SV *throw; /* exception to be thrown */
237 248
238 /* async_pool */ 249 /* async_pool */
239 SV *saved_deffh; 250 SV *saved_deffh;
240 251
241 /* linked list */ 252 /* linked list */
242 struct coro *next, *prev; 253 struct coro *next, *prev;
243 HV *hv; /* the perl hash associated with this coro, if any */
244}; 254};
245 255
246typedef struct coro *Coro__State; 256typedef struct coro *Coro__State;
247typedef struct coro *Coro__State_or_hashref; 257typedef struct coro *Coro__State_or_hashref;
248 258
262static struct coro *coro_first; 272static struct coro *coro_first;
263 273
264/** lowlevel stuff **********************************************************/ 274/** lowlevel stuff **********************************************************/
265 275
266static SV * 276static SV *
267coro_get_sv (const char *name, int create) 277coro_get_sv (pTHX_ const char *name, int create)
268{ 278{
269#if PERL_VERSION_ATLEAST (5,9,0) 279#if PERL_VERSION_ATLEAST (5,10,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create); 281 get_sv (name, create);
272#endif 282#endif
273 return get_sv (name, create); 283 return get_sv (name, create);
274} 284}
275 285
276static AV * 286static AV *
277coro_get_av (const char *name, int create) 287coro_get_av (pTHX_ const char *name, int create)
278{ 288{
279#if PERL_VERSION_ATLEAST (5,9,0) 289#if PERL_VERSION_ATLEAST (5,10,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create); 291 get_av (name, create);
282#endif 292#endif
283 return get_av (name, create); 293 return get_av (name, create);
284} 294}
285 295
286static HV * 296static HV *
287coro_get_hv (const char *name, int create) 297coro_get_hv (pTHX_ const char *name, int create)
288{ 298{
289#if PERL_VERSION_ATLEAST (5,9,0) 299#if PERL_VERSION_ATLEAST (5,10,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 300 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create); 301 get_hv (name, create);
292#endif 302#endif
293 return get_hv (name, create); 303 return get_hv (name, create);
294} 304}
299 AV *padlist = CvPADLIST (cv); 309 AV *padlist = CvPADLIST (cv);
300 AV *newpadlist, *newpad; 310 AV *newpadlist, *newpad;
301 311
302 newpadlist = newAV (); 312 newpadlist = newAV ();
303 AvREAL_off (newpadlist); 313 AvREAL_off (newpadlist);
304#if PERL_VERSION_ATLEAST (5,9,0) 314#if PERL_VERSION_ATLEAST (5,10,0)
305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 315 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
306#else 316#else
307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 317 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
308#endif 318#endif
309 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 319 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
347 357
348 /* casting is fun. */ 358 /* casting is fun. */
349 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 359 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
350 free_padlist (aTHX_ padlist); 360 free_padlist (aTHX_ padlist);
351 361
352 SvREFCNT_dec (av);
353
354 return 0; 362 return 0;
355} 363}
356 364
357#define PERL_MAGIC_coro PERL_MAGIC_ext 365#define CORO_MAGIC_type_cv PERL_MAGIC_ext
366#define CORO_MAGIC_type_state PERL_MAGIC_ext
358 367
359static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 368static MGVTBL coro_cv_vtbl = {
369 0, 0, 0, 0,
370 coro_cv_free
371};
360 372
361#define CORO_MAGIC(cv) \ 373#define CORO_MAGIC(sv,type) \
362 SvMAGIC (cv) \ 374 SvMAGIC (sv) \
363 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 375 ? SvMAGIC (sv)->mg_type == type \
364 ? SvMAGIC (cv) \ 376 ? SvMAGIC (sv) \
365 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 377 : mg_find (sv, type) \
366 : 0 378 : 0
379
380#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
381#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
367 382
368static struct coro * 383static struct coro *
369SvSTATE_ (pTHX_ SV *coro) 384SvSTATE_ (pTHX_ SV *coro)
370{ 385{
371 HV *stash; 386 HV *stash;
383 /* very slow, but rare, check */ 398 /* very slow, but rare, check */
384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 399 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
385 croak ("Coro::State object required"); 400 croak ("Coro::State object required");
386 } 401 }
387 402
388 mg = CORO_MAGIC (coro); 403 mg = CORO_MAGIC_state (coro);
389 return (struct coro *)mg->mg_ptr; 404 return (struct coro *)mg->mg_ptr;
390} 405}
391 406
392#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 407#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
393 408
394/* the next two functions merely cache the padlists */ 409/* the next two functions merely cache the padlists */
395static void 410static void
396get_padlist (pTHX_ CV *cv) 411get_padlist (pTHX_ CV *cv)
397{ 412{
398 MAGIC *mg = CORO_MAGIC (cv); 413 MAGIC *mg = CORO_MAGIC_cv (cv);
399 AV *av; 414 AV *av;
400 415
401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 416 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 417 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
403 else 418 else
415} 430}
416 431
417static void 432static void
418put_padlist (pTHX_ CV *cv) 433put_padlist (pTHX_ CV *cv)
419{ 434{
420 MAGIC *mg = CORO_MAGIC (cv); 435 MAGIC *mg = CORO_MAGIC_cv (cv);
421 AV *av; 436 AV *av;
422 437
423 if (expect_false (!mg)) 438 if (expect_false (!mg))
424 { 439 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
427 mg->mg_virtual = &vtbl_coro;
428 mg->mg_obj = (SV *)newAV ();
429 }
430 440
431 av = (AV *)mg->mg_obj; 441 av = (AV *)mg->mg_obj;
432 442
433 if (expect_false (AvFILLp (av) >= AvMAX (av))) 443 if (expect_false (AvFILLp (av) >= AvMAX (av)))
434 av_extend (av, AvMAX (av) + 1); 444 av_extend (av, AvMAX (av) + 1);
521 531
522 PUTBACK; 532 PUTBACK;
523 } 533 }
524 534
525 /* allocate some space on the context stack for our purposes */ 535 /* allocate some space on the context stack for our purposes */
536 /* we manually unroll here, as usually 2 slots is enough */
537 if (SLOT_COUNT >= 1) CXINC;
538 if (SLOT_COUNT >= 2) CXINC;
539 if (SLOT_COUNT >= 3) CXINC;
526 { 540 {
527 /* we manually unroll here, as usually 2 slots is enough */
528 int i; 541 int i;
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
532 for (i = 3; i < SLOT_COUNT; ++i) 542 for (i = 3; i < SLOT_COUNT; ++i)
533 CXINC; 543 CXINC;
534
535 cxstack_ix -= SLOT_COUNT; /* undo allocation */
536 } 544 }
545 cxstack_ix -= SLOT_COUNT; /* undo allocation */
537 546
538 c->mainstack = PL_mainstack; 547 c->mainstack = PL_mainstack;
539 548
540 { 549 {
541 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 550 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
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;
690 SvREFCNT_inc (PL_diehook ); hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 749#if PERL_VERSION_ATLEAST (5,10,0)
691 SvREFCNT_inc (PL_warnhook); hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 750 PL_parser = 0;
751#endif
752
753 /* recreate the die/warn hooks */
754 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
755 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
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);
711 PL_op = (OP *)&myop; 775 PL_op = (OP *)&myop;
712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 776 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
713 SPAGAIN; 777 SPAGAIN;
714 } 778 }
715 779
716 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 780 /* this newly created coroutine might be run on an existing cctx which most
781 * likely was suspended in set_stacklevel, called from entersub.
782 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
783 * so we ENTER here for symmetry
784 */
785 ENTER;
717} 786}
718 787
719static void 788static void
720coro_destroy (pTHX_ struct coro *coro) 789coro_destroy (pTHX_ struct coro *coro)
721{ 790{
805 PUSHMARK (SP); 874 PUSHMARK (SP);
806 PUSHs (&PL_sv_no); 875 PUSHs (&PL_sv_no);
807 PUSHs (fullname); 876 PUSHs (fullname);
808 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 877 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
809 PUTBACK; 878 PUTBACK;
810 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 879 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
811 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 880 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
812 SPAGAIN; 881 SPAGAIN;
813 FREETMPS; 882 FREETMPS;
814 LEAVE; 883 LEAVE;
815 PL_runops = runops_trace; 884 PL_runops = runops_trace;
842 SAVETMPS; 911 SAVETMPS;
843 EXTEND (SP, 3); 912 EXTEND (SP, 3);
844 PUSHMARK (SP); 913 PUSHMARK (SP);
845 PUSHs (&PL_sv_yes); 914 PUSHs (&PL_sv_yes);
846 PUSHs (fullname); 915 PUSHs (fullname);
847 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);
848 PUTBACK; 917 PUTBACK;
849 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 918 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
850 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);
851 SPAGAIN; 920 SPAGAIN;
852 FREETMPS; 921 FREETMPS;
853 LEAVE; 922 LEAVE;
854 PL_runops = runops_trace; 923 PL_runops = runops_trace;
868 PL_runops = RUNOPS_DEFAULT; 937 PL_runops = RUNOPS_DEFAULT;
869 PUSHMARK (SP); 938 PUSHMARK (SP);
870 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 939 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
871 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 940 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
872 PUTBACK; 941 PUTBACK;
873 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 942 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
874 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 943 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
875 SPAGAIN; 944 SPAGAIN;
876 FREETMPS; 945 FREETMPS;
877 LEAVE; 946 LEAVE;
878 PL_runops = runops_trace; 947 PL_runops = runops_trace;
1068 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");
1069 1138
1070 if (expect_false (next->flags & CF_DESTROYED)) 1139 if (expect_false (next->flags & CF_DESTROYED))
1071 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");
1072 1141
1073 if (
1074#if PERL_VERSION_ATLEAST (5,9,0) 1142#if !PERL_VERSION_ATLEAST (5,10,0)
1075 expect_false (PL_parser)
1076#else
1077 expect_false (PL_lex_state != LEX_NOTPARSING) 1143 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1078#endif
1079 )
1080 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
1081 } 1146 }
1082} 1147}
1083 1148
1084/* always use the TRANSFER macro */ 1149/* always use the TRANSFER macro */
1085static void NOINLINE 1150static void NOINLINE
1086transfer (pTHX_ struct coro *prev, struct coro *next) 1151transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1087{ 1152{
1088 dSTACKLEVEL; 1153 dSTACKLEVEL;
1154 static volatile int has_throw;
1089 1155
1090 /* sometimes transfer is only called to set idle_sp */ 1156 /* sometimes transfer is only called to set idle_sp */
1091 if (expect_false (!next)) 1157 if (expect_false (!next))
1092 { 1158 {
1093 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1159 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1108 prev->flags &= ~CF_RUNNING; 1174 prev->flags &= ~CF_RUNNING;
1109 next->flags |= CF_RUNNING; 1175 next->flags |= CF_RUNNING;
1110 1176
1111 LOCK; 1177 LOCK;
1112 1178
1179 /* first get rid of the old state */
1180 save_perl (aTHX_ prev);
1181
1113 if (expect_false (next->flags & CF_NEW)) 1182 if (expect_false (next->flags & CF_NEW))
1114 { 1183 {
1115 /* need to start coroutine */ 1184 /* need to start coroutine */
1116 next->flags &= ~CF_NEW; 1185 next->flags &= ~CF_NEW;
1117 /* first get rid of the old state */
1118 save_perl (aTHX_ prev);
1119 /* setup coroutine call */ 1186 /* setup coroutine call */
1120 coro_setup (aTHX_ next); 1187 coro_setup (aTHX_ next);
1121 } 1188 }
1122 else 1189 else
1123 {
1124 /* coroutine already started */
1125 save_perl (aTHX_ prev);
1126 load_perl (aTHX_ next); 1190 load_perl (aTHX_ next);
1127 }
1128 1191
1129 prev__cctx = prev->cctx; 1192 prev__cctx = prev->cctx;
1130 1193
1131 /* possibly "free" the cctx */ 1194 /* possibly "free" the cctx */
1132 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 ))
1133 { 1200 {
1134 /* 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 */
1135 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));
1136 1203
1137 prev->cctx = 0; 1204 prev->cctx = 0;
1147 1214
1148 ++next->usecount; 1215 ++next->usecount;
1149 1216
1150 if (expect_true (!next->cctx)) 1217 if (expect_true (!next->cctx))
1151 next->cctx = cctx_get (aTHX); 1218 next->cctx = cctx_get (aTHX);
1219
1220 has_throw = !!next->throw;
1152 1221
1153 if (expect_false (prev__cctx != next->cctx)) 1222 if (expect_false (prev__cctx != next->cctx))
1154 { 1223 {
1155 prev__cctx->top_env = PL_top_env; 1224 prev__cctx->top_env = PL_top_env;
1156 PL_top_env = next->cctx->top_env; 1225 PL_top_env = next->cctx->top_env;
1158 } 1227 }
1159 1228
1160 free_coro_mortal (aTHX); 1229 free_coro_mortal (aTHX);
1161 UNLOCK; 1230 UNLOCK;
1162 1231
1163 if (expect_false (prev->throw || next->throw)) 1232 if (expect_false (has_throw))
1164 { 1233 {
1165 struct coro *coro = SvSTATE (coro_current); 1234 struct coro *coro = SvSTATE (coro_current);
1166 1235
1167 if (coro->throw) 1236 if (coro->throw)
1168 { 1237 {
1178struct transfer_args 1247struct transfer_args
1179{ 1248{
1180 struct coro *prev, *next; 1249 struct coro *prev, *next;
1181}; 1250};
1182 1251
1183#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1252#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1184#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1253#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1185 1254
1186/** high level stuff ********************************************************/ 1255/** high level stuff ********************************************************/
1187 1256
1188static int 1257static int
1282{ 1351{
1283 dTHX; 1352 dTHX;
1284 struct transfer_args ta; 1353 struct transfer_args ta;
1285 1354
1286 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1355 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1287 TRANSFER (ta); 1356 TRANSFER (ta, 1);
1288} 1357}
1289 1358
1290/** Coro ********************************************************************/ 1359/** Coro ********************************************************************/
1291 1360
1292static void 1361static void
1294{ 1363{
1295 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);
1296} 1365}
1297 1366
1298static SV * 1367static SV *
1299coro_deq (pTHX_ int min_prio) 1368coro_deq (pTHX)
1300{ 1369{
1301 int prio = PRIO_MAX - PRIO_MIN; 1370 int prio;
1302 1371
1303 min_prio -= PRIO_MIN;
1304 if (min_prio < 0)
1305 min_prio = 0;
1306
1307 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1372 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1308 if (AvFILLp (coro_ready [prio]) >= 0) 1373 if (AvFILLp (coro_ready [prio]) >= 0)
1309 return av_shift (coro_ready [prio]); 1374 return av_shift (coro_ready [prio]);
1310 1375
1311 return 0; 1376 return 0;
1312} 1377}
1348 SV *prev_sv, *next_sv; 1413 SV *prev_sv, *next_sv;
1349 1414
1350 for (;;) 1415 for (;;)
1351 { 1416 {
1352 LOCK; 1417 LOCK;
1353 next_sv = coro_deq (aTHX_ PRIO_MIN); 1418 next_sv = coro_deq (aTHX);
1354 1419
1355 /* nothing to schedule: call the idle handler */ 1420 /* nothing to schedule: call the idle handler */
1356 if (expect_false (!next_sv)) 1421 if (expect_false (!next_sv))
1357 { 1422 {
1358 dSP; 1423 dSP;
1362 SAVETMPS; 1427 SAVETMPS;
1363 1428
1364 PUSHMARK (SP); 1429 PUSHMARK (SP);
1365 PUTBACK; 1430 PUTBACK;
1366 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1431 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1432 SPAGAIN;
1367 1433
1368 FREETMPS; 1434 FREETMPS;
1369 LEAVE; 1435 LEAVE;
1370 continue; 1436 continue;
1371 } 1437 }
1426{ 1492{
1427 dTHX; 1493 dTHX;
1428 struct transfer_args ta; 1494 struct transfer_args ta;
1429 1495
1430 prepare_schedule (aTHX_ &ta); 1496 prepare_schedule (aTHX_ &ta);
1431 TRANSFER (ta); 1497 TRANSFER (ta, 1);
1432} 1498}
1433 1499
1434static int 1500static int
1435api_cede (void) 1501api_cede (void)
1436{ 1502{
1439 1505
1440 prepare_cede (aTHX_ &ta); 1506 prepare_cede (aTHX_ &ta);
1441 1507
1442 if (expect_true (ta.prev != ta.next)) 1508 if (expect_true (ta.prev != ta.next))
1443 { 1509 {
1444 TRANSFER (ta); 1510 TRANSFER (ta, 1);
1445 return 1; 1511 return 1;
1446 } 1512 }
1447 else 1513 else
1448 return 0; 1514 return 0;
1449} 1515}
1454 dTHX; 1520 dTHX;
1455 struct transfer_args ta; 1521 struct transfer_args ta;
1456 1522
1457 if (prepare_cede_notself (aTHX_ &ta)) 1523 if (prepare_cede_notself (aTHX_ &ta))
1458 { 1524 {
1459 TRANSFER (ta); 1525 TRANSFER (ta, 1);
1460 return 1; 1526 return 1;
1461 } 1527 }
1462 else 1528 else
1463 return 0; 1529 return 0;
1464} 1530}
1501 BOOT_PAGESIZE; 1567 BOOT_PAGESIZE;
1502 1568
1503 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1569 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1504 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1570 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1505 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
1506 hv_sig = coro_get_hv ("SIG", TRUE); 1577 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1507 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1578 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1508 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1579 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1509
1510 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1511 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1512 1580
1513 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1581 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1514 1582
1515 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1583 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1516 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1584 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1522 1590
1523 while (main_top_env->je_prev) 1591 while (main_top_env->je_prev)
1524 main_top_env = main_top_env->je_prev; 1592 main_top_env = main_top_env->je_prev;
1525 1593
1526 coroapi.ver = CORO_API_VERSION; 1594 coroapi.ver = CORO_API_VERSION;
1595 coroapi.rev = CORO_API_REVISION;
1527 coroapi.transfer = api_transfer; 1596 coroapi.transfer = api_transfer;
1528 1597
1529 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1598 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1530} 1599}
1531 1600
1532SV * 1601SV *
1533new (char *klass, ...) 1602new (char *klass, ...)
1534 CODE: 1603 CODE:
1535{ 1604{
1536 struct coro *coro; 1605 struct coro *coro;
1606 MAGIC *mg;
1537 HV *hv; 1607 HV *hv;
1538 int i; 1608 int i;
1539 1609
1540 Newz (0, coro, 1, struct coro); 1610 Newz (0, coro, 1, struct coro);
1541 coro->args = newAV (); 1611 coro->args = newAV ();
1544 if (coro_first) coro_first->prev = coro; 1614 if (coro_first) coro_first->prev = coro;
1545 coro->next = coro_first; 1615 coro->next = coro_first;
1546 coro_first = coro; 1616 coro_first = coro;
1547 1617
1548 coro->hv = hv = newHV (); 1618 coro->hv = hv = newHV ();
1549 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;
1550 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1621 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1551 1622
1552 av_extend (coro->args, items - 1); 1623 av_extend (coro->args, items - 1);
1553 for (i = 1; i < items; i++) 1624 for (i = 1; i < items; i++)
1554 av_push (coro->args, newSVsv (ST (i))); 1625 av_push (coro->args, newSVsv (ST (i)));
1568 Coro::cede_notself = 4 1639 Coro::cede_notself = 4
1569 CODE: 1640 CODE:
1570{ 1641{
1571 struct transfer_args ta; 1642 struct transfer_args ta;
1572 1643
1644 PUTBACK;
1573 switch (ix) 1645 switch (ix)
1574 { 1646 {
1575 case 0: 1647 case 0:
1576 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1648 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1577 ta.next = 0; 1649 ta.next = 0;
1596 if (!prepare_cede_notself (aTHX_ &ta)) 1668 if (!prepare_cede_notself (aTHX_ &ta))
1597 XSRETURN_EMPTY; 1669 XSRETURN_EMPTY;
1598 1670
1599 break; 1671 break;
1600 } 1672 }
1673 SPAGAIN;
1601 1674
1602 BARRIER; 1675 BARRIER;
1676 PUTBACK;
1603 TRANSFER (ta); 1677 TRANSFER (ta, 0);
1604 1678 SPAGAIN; /* might be the sp of a different coroutine now */
1605 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1679 /* be extra careful not to ever do anything after TRANSFER */
1606 XSRETURN_YES;
1607} 1680}
1608 1681
1609bool 1682bool
1610_destroy (SV *coro_sv) 1683_destroy (SV *coro_sv)
1611 CODE: 1684 CODE:
1663 { 1736 {
1664 struct coro temp; 1737 struct coro temp;
1665 1738
1666 if (!(coro->flags & CF_RUNNING)) 1739 if (!(coro->flags & CF_RUNNING))
1667 { 1740 {
1741 PUTBACK;
1668 save_perl (aTHX_ &temp); 1742 save_perl (aTHX_ &temp);
1669 load_perl (aTHX_ coro); 1743 load_perl (aTHX_ coro);
1670 } 1744 }
1671 1745
1672 { 1746 {
1673 dSP; 1747 dSP;
1674 ENTER; 1748 ENTER;
1675 SAVETMPS; 1749 SAVETMPS;
1750 PUTBACK;
1751 PUSHSTACK;
1676 PUSHMARK (SP); 1752 PUSHMARK (SP);
1677 PUTBACK;
1678 1753
1679 if (ix) 1754 if (ix)
1680 eval_sv (coderef, 0); 1755 eval_sv (coderef, 0);
1681 else 1756 else
1682 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1757 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1683 1758
1759 POPSTACK;
1684 SPAGAIN; 1760 SPAGAIN;
1685 FREETMPS; 1761 FREETMPS;
1686 LEAVE; 1762 LEAVE;
1687 PUTBACK; 1763 PUTBACK;
1688 } 1764 }
1689 1765
1690 if (!(coro->flags & CF_RUNNING)) 1766 if (!(coro->flags & CF_RUNNING))
1691 { 1767 {
1692 save_perl (aTHX_ coro); 1768 save_perl (aTHX_ coro);
1693 load_perl (aTHX_ &temp); 1769 load_perl (aTHX_ &temp);
1770 SPAGAIN;
1694 } 1771 }
1695 } 1772 }
1696} 1773}
1697 1774
1698SV * 1775SV *
1739 case 1: RETVAL = coro->usecount; break; 1816 case 1: RETVAL = coro->usecount; break;
1740 } 1817 }
1741 OUTPUT: 1818 OUTPUT:
1742 RETVAL 1819 RETVAL
1743 1820
1821void
1822force_cctx ()
1823 CODE:
1824 struct coro *coro = SvSTATE (coro_current);
1825 coro->cctx->idle_sp = 0;
1744 1826
1745MODULE = Coro::State PACKAGE = Coro 1827MODULE = Coro::State PACKAGE = Coro
1746 1828
1747BOOT: 1829BOOT:
1748{ 1830{
1749 int i; 1831 int i;
1750 1832
1751 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1833 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1752 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1834 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1753 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1835 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1754 1836
1755 coro_current = coro_get_sv ("Coro::current", FALSE); 1837 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1756 SvREADONLY_on (coro_current); 1838 SvREADONLY_on (coro_current);
1757 1839
1758 coro_stash = gv_stashpv ("Coro", TRUE); 1840 coro_stash = gv_stashpv ("Coro", TRUE);
1759 1841
1760 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1835 PROTOTYPE: $;$ 1917 PROTOTYPE: $;$
1836 CODE: 1918 CODE:
1837 SvREFCNT_dec (self->throw); 1919 SvREFCNT_dec (self->throw);
1838 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1920 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1839 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
1840# for async_pool speedup 1938# for async_pool speedup
1841void 1939void
1842_pool_1 (SV *cb) 1940_pool_1 (SV *cb)
1843 CODE: 1941 CODE:
1844{ 1942{
1845 struct coro *coro = SvSTATE (coro_current); 1943 struct coro *coro = SvSTATE (coro_current);
1846 HV *hv = (HV *)SvRV (coro_current); 1944 HV *hv = (HV *)SvRV (coro_current);
1847 AV *defav = GvAV (PL_defgv); 1945 AV *defav = GvAV (PL_defgv);
1848 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1946 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1849 AV *invoke_av; 1947 AV *invoke_av;
1850 int i, len; 1948 int i, len;
1851 1949
1852 if (!invoke) 1950 if (!invoke)
1951 {
1952 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1853 croak ("\3async_pool terminate\2\n"); 1953 croak ("\3async_pool terminate\2\n");
1954 }
1854 1955
1855 SvREFCNT_dec (coro->saved_deffh); 1956 SvREFCNT_dec (coro->saved_deffh);
1856 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1957 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1857 1958
1858 hv_store (hv, "desc", sizeof ("desc") - 1, 1959 hv_store (hv, "desc", sizeof ("desc") - 1,
1859 newSVpvn (strpair ("[async_pool]")), 0); 1960 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1860 1961
1861 invoke_av = (AV *)SvRV (invoke); 1962 invoke_av = (AV *)SvRV (invoke);
1862 len = av_len (invoke_av); 1963 len = av_len (invoke_av);
1863 1964
1864 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1965 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1884 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1985 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1885 coro->saved_deffh = 0; 1986 coro->saved_deffh = 0;
1886 1987
1887 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1988 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1888 || 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;
1889 croak ("\3async_pool terminate\2\n"); 1992 croak ("\3async_pool terminate\2\n");
1993 }
1890 1994
1891 av_clear (GvAV (PL_defgv)); 1995 av_clear (GvAV (PL_defgv));
1892 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1996 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1893 newSVpvn (strpair ("[async_pool idle]")), 0); 1997 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1894 1998
1895 coro->prio = 0; 1999 coro->prio = 0;
1896 2000
1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2001 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1898 api_trace (coro_current, 0); 2002 api_trace (coro_current, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines