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.178 by root, Wed Oct 3 01:48:06 2007 UTC vs.
Revision 1.199 by root, Sun Oct 7 13:53:37 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
75/* 5.8.7 */ 76/* 5.8.7 */
76#ifndef SvRV_set 77#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 78# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 79#endif
79 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
88
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 90# undef CORO_STACKGUARD
82#endif 91#endif
83 92
84#ifndef CORO_STACKGUARD 93#ifndef CORO_STACKGUARD
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 107#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 108
100#if __GNUC__ >= 3 109#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 110# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 113#else
104# define attribute(x) 114# define attribute(x)
105# define BARRIER 115# define BARRIER
116# define expect(expr,value) (expr)
106#endif 117#endif
118
119#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1)
107 121
108#define NOINLINE attribute ((noinline)) 122#define NOINLINE attribute ((noinline))
109 123
110#include "CoroAPI.h" 124#include "CoroAPI.h"
111 125
132static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 147static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 148static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 149static SV *coro_mortal; /* will be freed after next transfer */
136 150
137static GV *irsgv; /* $/ */ 151static GV *irsgv; /* $/ */
152static GV *stdoutgv; /* *STDOUT */
153static SV *sv_diehook;
154static SV *sv_warnhook;
138 155
139/* async_pool helper stuff */ 156/* async_pool helper stuff */
140static SV *sv_pool_rss; 157static SV *sv_pool_rss;
141static SV *sv_pool_size; 158static SV *sv_pool_size;
142static AV *av_async_pool; 159static AV *av_async_pool;
178 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 198};
182 199
200/* the structure where most of the perl state is stored, overlaid on the cxstack */
201typedef struct {
202 SV *defsv;
203 AV *defav;
204 SV *errsv;
205 SV *irsgv;
206#define VAR(name,type) type name;
207# include "state.h"
208#undef VAR
209} perl_slots;
210
211#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
212
183/* this is a structure representing a perl-level coroutine */ 213/* this is a structure representing a perl-level coroutine */
184struct coro { 214struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 215 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 216 coro_cctx *cctx;
187 217
218 /* process data */
219 AV *mainstack;
220 perl_slots *slot; /* basically the saved sp */
221
188 /* data associated with this coroutine (initial args) */ 222 /* data associated with this coroutine (initial args) */
189 AV *args; 223 AV *args;
190 int refcnt; 224 int refcnt;
191 int flags; /* CF_ flags */ 225 int flags; /* CF_ flags */
192 226
193 /* optionally saved, might be zero */
194 AV *defav; /* @_ */
195 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */
197 IO *deffh; /* default filehandle */
198 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */
200
201#define VAR(name,type) type name;
202# include "state.h"
203#undef VAR
204
205 /* statistics */ 227 /* statistics */
206 int usecount; /* number of switches to this coro */ 228 int usecount; /* number of transfers to this coro */
207 229
208 /* coro process data */ 230 /* coro process data */
209 int prio; 231 int prio;
232 SV *throw;
233
234 /* async_pool */
235 SV *saved_deffh;
210 236
211 /* linked list */ 237 /* linked list */
212 struct coro *next, *prev; 238 struct coro *next, *prev;
213 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
214}; 240};
230static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 256static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
231static int coro_nready; 257static int coro_nready;
232static struct coro *coro_first; 258static struct coro *coro_first;
233 259
234/** lowlevel stuff **********************************************************/ 260/** lowlevel stuff **********************************************************/
261
262static SV *
263coro_get_sv (const char *name, int create)
264{
265#if PERL_VERSION_ATLEAST (5,9,0)
266 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
267 get_sv (name, create);
268#endif
269 return get_sv (name, create);
270}
271
272static SV *
273coro_get_av (const char *name, int create)
274{
275#if PERL_VERSION_ATLEAST (5,9,0)
276 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
277 get_av (name, create);
278#endif
279 return get_av (name, create);
280}
235 281
236static AV * 282static AV *
237coro_clone_padlist (pTHX_ CV *cv) 283coro_clone_padlist (pTHX_ CV *cv)
238{ 284{
239 AV *padlist = CvPADLIST (cv); 285 AV *padlist = CvPADLIST (cv);
312 MAGIC *mg; 358 MAGIC *mg;
313 359
314 if (SvROK (coro)) 360 if (SvROK (coro))
315 coro = SvRV (coro); 361 coro = SvRV (coro);
316 362
317 if (SvTYPE (coro) != SVt_PVHV) 363 if (expect_false (SvTYPE (coro) != SVt_PVHV))
318 croak ("Coro::State object required"); 364 croak ("Coro::State object required");
319 365
320 stash = SvSTASH (coro); 366 stash = SvSTASH (coro);
321 if (stash != coro_stash && stash != coro_state_stash) 367 if (expect_false (stash != coro_stash && stash != coro_state_stash))
322 { 368 {
323 /* very slow, but rare, check */ 369 /* very slow, but rare, check */
324 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 370 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
325 croak ("Coro::State object required"); 371 croak ("Coro::State object required");
326 } 372 }
336get_padlist (pTHX_ CV *cv) 382get_padlist (pTHX_ CV *cv)
337{ 383{
338 MAGIC *mg = CORO_MAGIC (cv); 384 MAGIC *mg = CORO_MAGIC (cv);
339 AV *av; 385 AV *av;
340 386
341 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 387 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
342 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 388 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
343 else 389 else
344 { 390 {
345#if CORO_PREFER_PERL_FUNCTIONS 391#if CORO_PREFER_PERL_FUNCTIONS
346 /* this is probably cleaner, but also slower? */ 392 /* this is probably cleaner, but also slower? */
358put_padlist (pTHX_ CV *cv) 404put_padlist (pTHX_ CV *cv)
359{ 405{
360 MAGIC *mg = CORO_MAGIC (cv); 406 MAGIC *mg = CORO_MAGIC (cv);
361 AV *av; 407 AV *av;
362 408
363 if (!mg) 409 if (expect_false (!mg))
364 { 410 {
365 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 411 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
366 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 412 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
367 mg->mg_virtual = &vtbl_coro; 413 mg->mg_virtual = &vtbl_coro;
368 mg->mg_obj = (SV *)newAV (); 414 mg->mg_obj = (SV *)newAV ();
369 } 415 }
370 416
371 av = (AV *)mg->mg_obj; 417 av = (AV *)mg->mg_obj;
372 418
373 if (AvFILLp (av) >= AvMAX (av)) 419 if (expect_false (AvFILLp (av) >= AvMAX (av)))
374 av_extend (av, AvMAX (av) + 1); 420 av_extend (av, AvMAX (av) + 1);
375 421
376 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 422 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
377} 423}
378 424
379/** load & save, init *******************************************************/ 425/** load & save, init *******************************************************/
380 426
381static void 427static void
382load_perl (pTHX_ Coro__State c) 428load_perl (pTHX_ Coro__State c)
383{ 429{
430 perl_slots *slot = c->slot;
431 c->slot = 0;
432
433 PL_mainstack = c->mainstack;
434
435 GvSV (PL_defgv) = slot->defsv;
436 GvAV (PL_defgv) = slot->defav;
437 GvSV (PL_errgv) = slot->errsv;
438 GvSV (irsgv) = slot->irsgv;
439
384#define VAR(name,type) PL_ ## name = c->name; 440 #define VAR(name,type) PL_ ## name = slot->name;
385# include "state.h" 441 # include "state.h"
386#undef VAR 442 #undef VAR
387
388 GvSV (PL_defgv) = c->defsv;
389 GvAV (PL_defgv) = c->defav;
390 GvSV (PL_errgv) = c->errsv;
391 GvIOp(PL_defoutgv) = c->deffh;
392 PL_rs = c->irssv;
393 GvSV (irsgv) = c->irssv_sv;
394 443
395 { 444 {
396 dSP; 445 dSP;
446
397 CV *cv; 447 CV *cv;
398 448
399 /* now do the ugly restore mess */ 449 /* now do the ugly restore mess */
400 while ((cv = (CV *)POPs)) 450 while (expect_true (cv = (CV *)POPs))
401 { 451 {
402 put_padlist (aTHX_ cv); /* mark this padlist as available */ 452 put_padlist (aTHX_ cv); /* mark this padlist as available */
403 CvDEPTH (cv) = PTR2IV (POPs); 453 CvDEPTH (cv) = PTR2IV (POPs);
404 CvPADLIST (cv) = (AV *)POPs; 454 CvPADLIST (cv) = (AV *)POPs;
405 } 455 }
424 474
425 XPUSHs (Nullsv); 475 XPUSHs (Nullsv);
426 /* this loop was inspired by pp_caller */ 476 /* this loop was inspired by pp_caller */
427 for (;;) 477 for (;;)
428 { 478 {
429 while (cxix >= 0) 479 while (expect_true (cxix >= 0))
430 { 480 {
431 PERL_CONTEXT *cx = &ccstk[cxix--]; 481 PERL_CONTEXT *cx = &ccstk[cxix--];
432 482
433 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 483 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
434 { 484 {
435 CV *cv = cx->blk_sub.cv; 485 CV *cv = cx->blk_sub.cv;
436 486
437 if (CvDEPTH (cv)) 487 if (expect_true (CvDEPTH (cv)))
438 { 488 {
439 EXTEND (SP, 3); 489 EXTEND (SP, 3);
440 PUSHs ((SV *)CvPADLIST (cv)); 490 PUSHs ((SV *)CvPADLIST (cv));
441 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 491 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
442 PUSHs ((SV *)cv); 492 PUSHs ((SV *)cv);
445 get_padlist (aTHX_ cv); 495 get_padlist (aTHX_ cv);
446 } 496 }
447 } 497 }
448 } 498 }
449 499
450 if (top_si->si_type == PERLSI_MAIN) 500 if (expect_true (top_si->si_type == PERLSI_MAIN))
451 break; 501 break;
452 502
453 top_si = top_si->si_prev; 503 top_si = top_si->si_prev;
454 ccstk = top_si->si_cxstack; 504 ccstk = top_si->si_cxstack;
455 cxix = top_si->si_cxix; 505 cxix = top_si->si_cxix;
456 } 506 }
457 507
458 PUTBACK; 508 PUTBACK;
459 } 509 }
460 510
511 /* allocate some space on the context stack for our purposes */
512 {
513 /* we manually unroll here, as usually 2 slots is enough */
514 int i;
515 if (SLOT_COUNT >= 1) CXINC;
516 if (SLOT_COUNT >= 2) CXINC;
517 if (SLOT_COUNT >= 3) CXINC;
518 for (i = 3; i < SLOT_COUNT; ++i)
519 CXINC;
520
521 cxstack_ix -= SLOT_COUNT; /* undo allocation */
522 }
523
524 c->mainstack = PL_mainstack;
525
526 {
527 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
528
461 c->defav = GvAV (PL_defgv); 529 slot->defav = GvAV (PL_defgv);
462 c->defsv = DEFSV; 530 slot->defsv = DEFSV;
463 c->errsv = ERRSV; 531 slot->errsv = ERRSV;
464 c->deffh = GvIOp (PL_defoutgv);
465 c->irssv = PL_rs;
466 c->irssv_sv = GvSV (irsgv); 532 slot->irsgv = GvSV (irsgv);
467 533
468#define VAR(name,type)c->name = PL_ ## name; 534 #define VAR(name,type) slot->name = PL_ ## name;
469# include "state.h" 535 # include "state.h"
470#undef VAR 536 #undef VAR
537 }
471} 538}
472 539
473/* 540/*
474 * allocate various perl stacks. This is an exact copy 541 * allocate various perl stacks. This is an exact copy
475 * of perl.c:init_stacks, except that it uses less memory 542 * of perl.c:init_stacks, except that it uses less memory
480# define coro_init_stacks init_stacks 547# define coro_init_stacks init_stacks
481#else 548#else
482static void 549static void
483coro_init_stacks (pTHX) 550coro_init_stacks (pTHX)
484{ 551{
485 PL_curstackinfo = new_stackinfo(64, 6); 552 PL_curstackinfo = new_stackinfo(32, 8);
486 PL_curstackinfo->si_type = PERLSI_MAIN; 553 PL_curstackinfo->si_type = PERLSI_MAIN;
487 PL_curstack = PL_curstackinfo->si_stack; 554 PL_curstack = PL_curstackinfo->si_stack;
488 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 555 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
489 556
490 PL_stack_base = AvARRAY(PL_curstack); 557 PL_stack_base = AvARRAY(PL_curstack);
491 PL_stack_sp = PL_stack_base; 558 PL_stack_sp = PL_stack_base;
492 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 559 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
493 560
494 New(50,PL_tmps_stack,64,SV*); 561 New(50,PL_tmps_stack,32,SV*);
495 PL_tmps_floor = -1; 562 PL_tmps_floor = -1;
496 PL_tmps_ix = -1; 563 PL_tmps_ix = -1;
497 PL_tmps_max = 64; 564 PL_tmps_max = 32;
498 565
499 New(54,PL_markstack,16,I32); 566 New(54,PL_markstack,16,I32);
500 PL_markstack_ptr = PL_markstack; 567 PL_markstack_ptr = PL_markstack;
501 PL_markstack_max = PL_markstack + 16; 568 PL_markstack_max = PL_markstack + 16;
502 569
503#ifdef SET_MARK_OFFSET 570#ifdef SET_MARK_OFFSET
504 SET_MARK_OFFSET; 571 SET_MARK_OFFSET;
505#endif 572#endif
506 573
507 New(54,PL_scopestack,16,I32); 574 New(54,PL_scopestack,8,I32);
508 PL_scopestack_ix = 0; 575 PL_scopestack_ix = 0;
509 PL_scopestack_max = 16; 576 PL_scopestack_max = 8;
510 577
511 New(54,PL_savestack,64,ANY); 578 New(54,PL_savestack,24,ANY);
512 PL_savestack_ix = 0; 579 PL_savestack_ix = 0;
513 PL_savestack_max = 64; 580 PL_savestack_max = 24;
514 581
515#if !PERL_VERSION_ATLEAST (5,9,0) 582#if !PERL_VERSION_ATLEAST (5,9,0)
516 New(54,PL_retstack,4,OP*); 583 New(54,PL_retstack,4,OP*);
517 PL_retstack_ix = 0; 584 PL_retstack_ix = 0;
518 PL_retstack_max = 4; 585 PL_retstack_max = 4;
551} 618}
552 619
553static size_t 620static size_t
554coro_rss (pTHX_ struct coro *coro) 621coro_rss (pTHX_ struct coro *coro)
555{ 622{
556 size_t rss = sizeof (coro); 623 size_t rss = sizeof (*coro);
557 624
558 if (coro->mainstack) 625 if (coro->mainstack)
559 { 626 {
627 perl_slots tmp_slot;
628 perl_slots *slot;
629
560 if (coro->flags & CF_RUNNING) 630 if (coro->flags & CF_RUNNING)
561 { 631 {
632 slot = &tmp_slot;
633
562 #define VAR(name,type)coro->name = PL_ ## name; 634 #define VAR(name,type) slot->name = PL_ ## name;
563 # include "state.h" 635 # include "state.h"
564 #undef VAR 636 #undef VAR
565 } 637 }
638 else
639 slot = coro->slot;
566 640
567 rss += sizeof (coro->curstackinfo); 641 rss += sizeof (slot->curstackinfo);
568 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 642 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
570 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 643 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
571 rss += coro->tmps_max * sizeof (SV *); 644 rss += slot->tmps_max * sizeof (SV *);
572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 645 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
573 rss += coro->scopestack_max * sizeof (I32); 646 rss += slot->scopestack_max * sizeof (I32);
574 rss += coro->savestack_max * sizeof (ANY); 647 rss += slot->savestack_max * sizeof (ANY);
575 648
576#if !PERL_VERSION_ATLEAST (5,9,0) 649#if !PERL_VERSION_ATLEAST (5,9,0)
577 rss += coro->retstack_max * sizeof (OP *); 650 rss += slot->retstack_max * sizeof (OP *);
578#endif 651#endif
579 } 652 }
580 653
581 return rss; 654 return rss;
582} 655}
583 656
584/** coroutine stack handling ************************************************/ 657/** coroutine stack handling ************************************************/
585 658
586static void 659static void
587setup_coro (pTHX_ struct coro *coro) 660coro_setup (pTHX_ struct coro *coro)
588{ 661{
589 /* 662 /*
590 * emulate part of the perl startup here. 663 * emulate part of the perl startup here.
591 */ 664 */
592 coro_init_stacks (aTHX); 665 coro_init_stacks (aTHX);
594 PL_runops = RUNOPS_DEFAULT; 667 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 668 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 669 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 670 PL_comppad = 0;
598 PL_curpm = 0; 671 PL_curpm = 0;
672 PL_curpad = 0;
599 PL_localizing = 0; 673 PL_localizing = 0;
600 PL_dirty = 0; 674 PL_dirty = 0;
601 PL_restartop = 0; 675 PL_restartop = 0;
676 PL_diehook = SvREFCNT_inc (sv_diehook);
677 PL_warnhook = SvREFCNT_inc (sv_warnhook);
602 678
603 GvSV (PL_defgv) = NEWSV (0, 0); 679 GvSV (PL_defgv) = newSV (0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 680 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 681 GvSV (PL_errgv) = newSV (0);
606 GvSV (irsgv) = newSVsv (PL_rs); 682 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
607 PL_rs = newSVpvn ("\n", 1); 683 PL_rs = newSVsv (GvSV (irsgv));
608 684 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
609 {
610 IO *io = newIO ();
611 GvIOp(PL_defoutgv) = io;
612 IoTYPE (io) = IoTYPE_WRONLY;
613 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
614 IoFLAGS (io) |= IOf_FLUSH;
615 }
616 685
617 { 686 {
618 dSP; 687 dSP;
619 LOGOP myop; 688 LOGOP myop;
620 689
621 Zero (&myop, 1, LOGOP); 690 Zero (&myop, 1, LOGOP);
622 myop.op_next = Nullop; 691 myop.op_next = Nullop;
623 myop.op_flags = OPf_WANT_VOID; 692 myop.op_flags = OPf_WANT_VOID;
624 693
625 PUSHMARK (SP); 694 PUSHMARK (SP);
626 XPUSHs (av_shift (GvAV (PL_defgv))); 695 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
627 PUTBACK; 696 PUTBACK;
628 PL_op = (OP *)&myop; 697 PL_op = (OP *)&myop;
629 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 698 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
630 SPAGAIN; 699 SPAGAIN;
631 } 700 }
632 701
633 ENTER; /* necessary e.g. for dounwind */ 702 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
634} 703}
635 704
636static void 705static void
637destroy_coro (pTHX_ struct coro *coro) 706coro_destroy (pTHX_ struct coro *coro)
638{ 707{
639 if (!IN_DESTRUCT) 708 if (!IN_DESTRUCT)
640 { 709 {
641 /* restore all saved variables and stuff */ 710 /* restore all saved variables and stuff */
642 LEAVE_SCOPE (0); 711 LEAVE_SCOPE (0);
654 } 723 }
655 724
656 SvREFCNT_dec (GvSV (PL_defgv)); 725 SvREFCNT_dec (GvSV (PL_defgv));
657 SvREFCNT_dec (GvAV (PL_defgv)); 726 SvREFCNT_dec (GvAV (PL_defgv));
658 SvREFCNT_dec (GvSV (PL_errgv)); 727 SvREFCNT_dec (GvSV (PL_errgv));
659 SvREFCNT_dec (GvIOp(PL_defoutgv)); 728 SvREFCNT_dec (PL_defoutgv);
660 SvREFCNT_dec (PL_rs); 729 SvREFCNT_dec (PL_rs);
661 SvREFCNT_dec (GvSV (irsgv)); 730 SvREFCNT_dec (GvSV (irsgv));
662 731
732 SvREFCNT_dec (PL_diehook);
733 SvREFCNT_dec (PL_warnhook);
734
735 SvREFCNT_dec (coro->saved_deffh);
736 SvREFCNT_dec (coro->throw);
737
663 coro_destroy_stacks (aTHX); 738 coro_destroy_stacks (aTHX);
664} 739}
665 740
666static void 741static void
667free_coro_mortal (pTHX) 742free_coro_mortal (pTHX)
668{ 743{
669 if (coro_mortal) 744 if (expect_true (coro_mortal))
670 { 745 {
671 SvREFCNT_dec (coro_mortal); 746 SvREFCNT_dec (coro_mortal);
672 coro_mortal = 0; 747 coro_mortal = 0;
673 } 748 }
674} 749}
703 bot = PL_stack_base + cx->blk_oldsp + 1; 778 bot = PL_stack_base + cx->blk_oldsp + 1;
704 top = cx->blk_gimme == G_ARRAY ? SP + 1 779 top = cx->blk_gimme == G_ARRAY ? SP + 1
705 : cx->blk_gimme == G_SCALAR ? bot + 1 780 : cx->blk_gimme == G_SCALAR ? bot + 1
706 : bot; 781 : bot;
707 782
783 av_extend (av, top - bot);
708 while (bot < top) 784 while (bot < top)
709 av_push (av, SvREFCNT_inc (*bot++)); 785 av_push (av, SvREFCNT_inc (*bot++));
710 786
711 PL_runops = RUNOPS_DEFAULT; 787 PL_runops = RUNOPS_DEFAULT;
712 ENTER; 788 ENTER;
924 Safefree (cctx->sptr); 1000 Safefree (cctx->sptr);
925 1001
926 Safefree (cctx); 1002 Safefree (cctx);
927} 1003}
928 1004
1005/* wether this cctx should be destructed */
1006#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1007
929static coro_cctx * 1008static coro_cctx *
930cctx_get (pTHX) 1009cctx_get (pTHX)
931{ 1010{
932 while (cctx_first) 1011 while (expect_true (cctx_first))
933 { 1012 {
934 coro_cctx *cctx = cctx_first; 1013 coro_cctx *cctx = cctx_first;
935 cctx_first = cctx->next; 1014 cctx_first = cctx->next;
936 --cctx_idle; 1015 --cctx_idle;
937 1016
938 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1017 if (expect_true (!CCTX_EXPIRED (cctx)))
939 return cctx; 1018 return cctx;
940 1019
941 cctx_destroy (cctx); 1020 cctx_destroy (cctx);
942 } 1021 }
943 1022
946 1025
947static void 1026static void
948cctx_put (coro_cctx *cctx) 1027cctx_put (coro_cctx *cctx)
949{ 1028{
950 /* free another cctx if overlimit */ 1029 /* free another cctx if overlimit */
951 if (cctx_idle >= MAX_IDLE_CCTX) 1030 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
952 { 1031 {
953 coro_cctx *first = cctx_first; 1032 coro_cctx *first = cctx_first;
954 cctx_first = first->next; 1033 cctx_first = first->next;
955 --cctx_idle; 1034 --cctx_idle;
956 1035
962 cctx_first = cctx; 1041 cctx_first = cctx;
963} 1042}
964 1043
965/** coroutine switching *****************************************************/ 1044/** coroutine switching *****************************************************/
966 1045
967static void NOINLINE 1046static void
968transfer_check (pTHX_ struct coro *prev, struct coro *next) 1047transfer_check (pTHX_ struct coro *prev, struct coro *next)
969{ 1048{
970 if (prev != next) 1049 if (expect_true (prev != next))
971 { 1050 {
972 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1051 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
973 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1052 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
974 1053
975 if (next->flags & CF_RUNNING) 1054 if (expect_false (next->flags & CF_RUNNING))
976 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1055 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
977 1056
978 if (next->flags & CF_DESTROYED) 1057 if (expect_false (next->flags & CF_DESTROYED))
979 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1058 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
980 1059
1060 if (
1061#if PERL_VERSION_ATLEAST (5,9,0)
1062 expect_false (PL_parser)
1063#else
981 if (PL_lex_state != LEX_NOTPARSING) 1064 expect_false (PL_lex_state != LEX_NOTPARSING)
1065#endif
1066 )
982 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1067 croak ("Coro::State::transfer called while parsing, but this is not supported");
983 } 1068 }
984} 1069}
985 1070
986/* always use the TRANSFER macro */ 1071/* always use the TRANSFER macro */
988transfer (pTHX_ struct coro *prev, struct coro *next) 1073transfer (pTHX_ struct coro *prev, struct coro *next)
989{ 1074{
990 dSTACKLEVEL; 1075 dSTACKLEVEL;
991 1076
992 /* sometimes transfer is only called to set idle_sp */ 1077 /* sometimes transfer is only called to set idle_sp */
993 if (!next) 1078 if (expect_false (!next))
994 { 1079 {
995 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1080 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
996 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1081 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
997 } 1082 }
998 else if (prev != next) 1083 else if (expect_true (prev != next))
999 { 1084 {
1000 coro_cctx *prev__cctx; 1085 coro_cctx *prev__cctx;
1001 1086
1002 if (prev->flags & CF_NEW) 1087 if (expect_false (prev->flags & CF_NEW))
1003 { 1088 {
1004 /* create a new empty context */ 1089 /* create a new empty context */
1005 Newz (0, prev->cctx, 1, coro_cctx); 1090 Newz (0, prev->cctx, 1, coro_cctx);
1006 prev->flags &= ~CF_NEW; 1091 prev->flags &= ~CF_NEW;
1007 prev->flags |= CF_RUNNING; 1092 prev->flags |= CF_RUNNING;
1010 prev->flags &= ~CF_RUNNING; 1095 prev->flags &= ~CF_RUNNING;
1011 next->flags |= CF_RUNNING; 1096 next->flags |= CF_RUNNING;
1012 1097
1013 LOCK; 1098 LOCK;
1014 1099
1015 if (next->flags & CF_NEW) 1100 if (expect_false (next->flags & CF_NEW))
1016 { 1101 {
1017 /* need to start coroutine */ 1102 /* need to start coroutine */
1018 next->flags &= ~CF_NEW; 1103 next->flags &= ~CF_NEW;
1019 /* first get rid of the old state */ 1104 /* first get rid of the old state */
1020 save_perl (aTHX_ prev); 1105 save_perl (aTHX_ prev);
1021 /* setup coroutine call */ 1106 /* setup coroutine call */
1022 setup_coro (aTHX_ next); 1107 coro_setup (aTHX_ next);
1023 } 1108 }
1024 else 1109 else
1025 { 1110 {
1026 /* coroutine already started */ 1111 /* coroutine already started */
1027 save_perl (aTHX_ prev); 1112 save_perl (aTHX_ prev);
1029 } 1114 }
1030 1115
1031 prev__cctx = prev->cctx; 1116 prev__cctx = prev->cctx;
1032 1117
1033 /* possibly "free" the cctx */ 1118 /* possibly "free" the cctx */
1034 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1119 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1035 { 1120 {
1036 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1121 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1037 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1122 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1038 1123
1039 prev->cctx = 0; 1124 prev->cctx = 0;
1040 1125
1126 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1127 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1128 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1129 next->cctx = cctx_get (aTHX);
1130
1041 cctx_put (prev__cctx); 1131 cctx_put (prev__cctx);
1042 } 1132 }
1043 1133
1044 ++next->usecount; 1134 ++next->usecount;
1045 1135
1046 if (!next->cctx) 1136 if (expect_true (!next->cctx))
1047 next->cctx = cctx_get (aTHX); 1137 next->cctx = cctx_get (aTHX);
1048 1138
1049 if (prev__cctx != next->cctx) 1139 if (expect_false (prev__cctx != next->cctx))
1050 { 1140 {
1051 prev__cctx->top_env = PL_top_env; 1141 prev__cctx->top_env = PL_top_env;
1052 PL_top_env = next->cctx->top_env; 1142 PL_top_env = next->cctx->top_env;
1053 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1143 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1054 } 1144 }
1055 1145
1056 free_coro_mortal (aTHX); 1146 free_coro_mortal (aTHX);
1057 UNLOCK; 1147 UNLOCK;
1148
1149 if (expect_false (prev->throw || next->throw))
1150 {
1151 struct coro *coro = SvSTATE (coro_current);
1152
1153 if (coro->throw)
1154 {
1155 SV *exception = coro->throw;
1156 coro->throw = 0;
1157 sv_setsv (ERRSV, exception);
1158 croak (0);
1159 }
1160 }
1058 } 1161 }
1059} 1162}
1060 1163
1061struct transfer_args 1164struct transfer_args
1062{ 1165{
1095 croak ("FATAL: tried to destroy currently running coroutine"); 1198 croak ("FATAL: tried to destroy currently running coroutine");
1096 1199
1097 save_perl (aTHX_ &temp); 1200 save_perl (aTHX_ &temp);
1098 load_perl (aTHX_ coro); 1201 load_perl (aTHX_ coro);
1099 1202
1100 destroy_coro (aTHX_ coro); 1203 coro_destroy (aTHX_ coro);
1101 1204
1102 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1205 load_perl (aTHX_ &temp);
1103 1206
1104 coro->mainstack = 0; 1207 coro->slot = 0;
1105 } 1208 }
1106 1209
1107 cctx_destroy (coro->cctx); 1210 cctx_destroy (coro->cctx);
1108 SvREFCNT_dec (coro->args); 1211 SvREFCNT_dec (coro->args);
1109 1212
1234 { 1337 {
1235 LOCK; 1338 LOCK;
1236 next_sv = coro_deq (aTHX_ PRIO_MIN); 1339 next_sv = coro_deq (aTHX_ PRIO_MIN);
1237 1340
1238 /* nothing to schedule: call the idle handler */ 1341 /* nothing to schedule: call the idle handler */
1239 if (!next_sv) 1342 if (expect_false (!next_sv))
1240 { 1343 {
1241 dSP; 1344 dSP;
1242 UNLOCK; 1345 UNLOCK;
1243 1346
1244 ENTER; 1347 ENTER;
1254 } 1357 }
1255 1358
1256 ta->next = SvSTATE (next_sv); 1359 ta->next = SvSTATE (next_sv);
1257 1360
1258 /* cannot transfer to destroyed coros, skip and look for next */ 1361 /* cannot transfer to destroyed coros, skip and look for next */
1259 if (ta->next->flags & CF_DESTROYED) 1362 if (expect_false (ta->next->flags & CF_DESTROYED))
1260 { 1363 {
1261 UNLOCK; 1364 UNLOCK;
1262 SvREFCNT_dec (next_sv); 1365 SvREFCNT_dec (next_sv);
1263 /* coro_nready is already taken care of by destroy */ 1366 /* coro_nready is already taken care of by destroy */
1264 continue; 1367 continue;
1320 dTHX; 1423 dTHX;
1321 struct transfer_args ta; 1424 struct transfer_args ta;
1322 1425
1323 prepare_cede (aTHX_ &ta); 1426 prepare_cede (aTHX_ &ta);
1324 1427
1325 if (ta.prev != ta.next) 1428 if (expect_true (ta.prev != ta.next))
1326 { 1429 {
1327 TRANSFER (ta); 1430 TRANSFER (ta);
1328 return 1; 1431 return 1;
1329 } 1432 }
1330 else 1433 else
1366 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1469 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1367 1470
1368 if (coro->flags & CF_RUNNING) 1471 if (coro->flags & CF_RUNNING)
1369 PL_runops = RUNOPS_DEFAULT; 1472 PL_runops = RUNOPS_DEFAULT;
1370 else 1473 else
1371 coro->runops = RUNOPS_DEFAULT; 1474 coro->slot->runops = RUNOPS_DEFAULT;
1372 } 1475 }
1373} 1476}
1374 1477
1375MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1478MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1376 1479
1381#ifdef USE_ITHREADS 1484#ifdef USE_ITHREADS
1382 MUTEX_INIT (&coro_mutex); 1485 MUTEX_INIT (&coro_mutex);
1383#endif 1486#endif
1384 BOOT_PAGESIZE; 1487 BOOT_PAGESIZE;
1385 1488
1386 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1489 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1490 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1491
1492 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1493 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1494
1495 if (!PL_diehook) PL_diehook = SvREFCNT_inc (sv_diehook);
1496 if (!PL_warnhook) PL_warnhook = SvREFCNT_inc (sv_warnhook);
1387 1497
1388 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1498 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1389 1499
1390 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1500 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1391 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1501 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1422 1532
1423 coro->hv = hv = newHV (); 1533 coro->hv = hv = newHV ();
1424 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1534 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1425 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1535 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1426 1536
1537 av_extend (coro->args, items - 1);
1427 for (i = 1; i < items; i++) 1538 for (i = 1; i < items; i++)
1428 av_push (coro->args, newSVsv (ST (i))); 1539 av_push (coro->args, newSVsv (ST (i)));
1429} 1540}
1430 OUTPUT: 1541 OUTPUT:
1431 RETVAL 1542 RETVAL
1474 } 1585 }
1475 1586
1476 BARRIER; 1587 BARRIER;
1477 TRANSFER (ta); 1588 TRANSFER (ta);
1478 1589
1479 if (GIMME_V != G_VOID && ta.next != ta.prev) 1590 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1480 XSRETURN_YES; 1591 XSRETURN_YES;
1481} 1592}
1482 1593
1483bool 1594bool
1484_destroy (SV *coro_sv) 1595_destroy (SV *coro_sv)
1534 CODE: 1645 CODE:
1535{ 1646{
1536 if (coro->mainstack) 1647 if (coro->mainstack)
1537 { 1648 {
1538 struct coro temp; 1649 struct coro temp;
1539 Zero (&temp, 1, struct coro);
1540 1650
1541 if (!(coro->flags & CF_RUNNING)) 1651 if (!(coro->flags & CF_RUNNING))
1542 { 1652 {
1543 save_perl (aTHX_ &temp); 1653 save_perl (aTHX_ &temp);
1544 load_perl (aTHX_ coro); 1654 load_perl (aTHX_ coro);
1548 dSP; 1658 dSP;
1549 ENTER; 1659 ENTER;
1550 SAVETMPS; 1660 SAVETMPS;
1551 PUSHMARK (SP); 1661 PUSHMARK (SP);
1552 PUTBACK; 1662 PUTBACK;
1663
1553 if (ix) 1664 if (ix)
1554 eval_sv (coderef, 0); 1665 eval_sv (coderef, 0);
1555 else 1666 else
1556 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1667 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1668
1557 SPAGAIN; 1669 SPAGAIN;
1558 FREETMPS; 1670 FREETMPS;
1559 LEAVE; 1671 LEAVE;
1560 PUTBACK; 1672 PUTBACK;
1561 } 1673 }
1619 1731
1620BOOT: 1732BOOT:
1621{ 1733{
1622 int i; 1734 int i;
1623 1735
1624 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1736 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1625 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1737 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1626 av_async_pool = get_av ("Coro::async_pool", TRUE); 1738 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1627 1739
1628 coro_current = get_sv ("Coro::current", FALSE); 1740 coro_current = coro_get_sv ("Coro::current", FALSE);
1629 SvREADONLY_on (coro_current); 1741 SvREADONLY_on (coro_current);
1630 1742
1631 coro_stash = gv_stashpv ("Coro", TRUE); 1743 coro_stash = gv_stashpv ("Coro", TRUE);
1632 1744
1633 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1745 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1634 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1746 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1635 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1747 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1636 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1748 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1639 1751
1640 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1752 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1641 coro_ready[i] = newAV (); 1753 coro_ready[i] = newAV ();
1642 1754
1643 { 1755 {
1644 SV *sv = perl_get_sv("Coro::API", 1); 1756 SV *sv = perl_get_sv ("Coro::API", TRUE);
1757 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1645 1758
1646 coroapi.schedule = api_schedule; 1759 coroapi.schedule = api_schedule;
1647 coroapi.cede = api_cede; 1760 coroapi.cede = api_cede;
1648 coroapi.cede_notself = api_cede_notself; 1761 coroapi.cede_notself = api_cede_notself;
1649 coroapi.ready = api_ready; 1762 coroapi.ready = api_ready;
1700 CODE: 1813 CODE:
1701 RETVAL = coro_nready; 1814 RETVAL = coro_nready;
1702 OUTPUT: 1815 OUTPUT:
1703 RETVAL 1816 RETVAL
1704 1817
1818void
1819throw (Coro::State self, SV *throw = &PL_sv_undef)
1820 PROTOTYPE: $;$
1821 CODE:
1822 SvREFCNT_dec (self->throw);
1823 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1824
1705# for async_pool speedup 1825# for async_pool speedup
1706void 1826void
1707_pool_1 (SV *cb) 1827_pool_1 (SV *cb)
1708 CODE: 1828 CODE:
1709{ 1829{
1710 int i, len; 1830 struct coro *coro = SvSTATE (coro_current);
1711 HV *hv = (HV *)SvRV (coro_current); 1831 HV *hv = (HV *)SvRV (coro_current);
1712 AV *defav = GvAV (PL_defgv); 1832 AV *defav = GvAV (PL_defgv);
1713 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1833 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1714 AV *invoke_av; 1834 AV *invoke_av;
1835 int i, len;
1715 1836
1716 if (!invoke) 1837 if (!invoke)
1717 croak ("\3terminate\2\n"); 1838 croak ("\3async_pool terminate\2\n");
1839
1840 SvREFCNT_dec (coro->saved_deffh);
1841 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1718 1842
1719 hv_store (hv, "desc", sizeof ("desc") - 1, 1843 hv_store (hv, "desc", sizeof ("desc") - 1,
1720 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1844 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1721 1845
1722 invoke_av = (AV *)SvRV (invoke); 1846 invoke_av = (AV *)SvRV (invoke);
1740{ 1864{
1741 struct coro *coro = SvSTATE (coro_current); 1865 struct coro *coro = SvSTATE (coro_current);
1742 1866
1743 sv_setsv (cb, &PL_sv_undef); 1867 sv_setsv (cb, &PL_sv_undef);
1744 1868
1869 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1870 coro->saved_deffh = 0;
1871
1745 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1872 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1746 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1873 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1747 croak ("\3terminate\2\n"); 1874 croak ("\3async_pool terminate\2\n");
1748 1875
1749 av_clear (GvAV (PL_defgv)); 1876 av_clear (GvAV (PL_defgv));
1750 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1877 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1751 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1878 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1752 1879

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines