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.177 by root, Tue Oct 2 10:24:44 2007 UTC vs.
Revision 1.190 by root, Fri Oct 5 20:39:39 2007 UTC

… …
75/* 5.8.7 */ 75/* 5.8.7 */
76#ifndef SvRV_set 76#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 77# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 78#endif
79 79
80/* 5.8.8 */
81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0
83#endif
84
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 85#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 86# undef CORO_STACKGUARD
82#endif 87#endif
83 88
84#ifndef CORO_STACKGUARD 89#ifndef CORO_STACKGUARD
… …
131static struct CoroAPI coroapi; 136static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 137static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 138static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 139static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 140static SV *coro_mortal; /* will be freed after next transfer */
141
142static GV *irsgv; /* $/ */
143static GV *stdoutgv; /* *STDOUT */
136 144
137/* async_pool helper stuff */ 145/* async_pool helper stuff */
138static SV *sv_pool_rss; 146static SV *sv_pool_rss;
139static SV *sv_pool_size; 147static SV *sv_pool_size;
140static AV *av_async_pool; 148static AV *av_async_pool;
… …
184 coro_cctx *cctx; 192 coro_cctx *cctx;
185 193
186 /* data associated with this coroutine (initial args) */ 194 /* data associated with this coroutine (initial args) */
187 AV *args; 195 AV *args;
188 int refcnt; 196 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 197 int flags; /* CF_ flags */
191 198
192 /* optionally saved, might be zero */ 199 /* optionally saved, might be zero */
193 AV *defav; /* @_ */ 200 AV *defav; /* @_ */
194 SV *defsv; /* $_ */ 201 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */ 202 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */ 203 SV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */ 204 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */ 205 SV *irssv_sv; /* real $/ cache */
199 206
200#define VAR(name,type) type name; 207#define VAR(name,type) type name;
201# include "state.h" 208# include "state.h"
202#undef VAR 209#undef VAR
203 210
204 /* statistics */ 211 /* statistics */
205 int usecount; /* number of switches to this coro */ 212 int usecount; /* number of transfers to this coro */
206 213
207 /* coro process data */ 214 /* coro process data */
208 int prio; 215 int prio;
216 //SV *throw;
217
218 /* async_pool */
219 SV *saved_deffh;
209 220
210 /* linked list */ 221 /* linked list */
211 struct coro *next, *prev; 222 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */ 223 HV *hv; /* the perl hash associated with this coro, if any */
213}; 224};
… …
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 386 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 387}
377 388
378/** load & save, init *******************************************************/ 389/** load & save, init *******************************************************/
379 390
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384
385static void 391static void
386load_perl (pTHX_ Coro__State c) 392load_perl (pTHX_ Coro__State c)
387{ 393{
388#define VAR(name,type) PL_ ## name = c->name; 394#define VAR(name,type) PL_ ## name = c->name;
389# include "state.h" 395# include "state.h"
390#undef VAR 396#undef VAR
391 397
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 398 GvSV (PL_defgv) = c->defsv;
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 399 GvAV (PL_defgv) = c->defav;
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 400 GvSV (PL_errgv) = c->errsv;
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 401 GvSV (irsgv) = c->irssv_sv;
396
397 if (c->irssv)
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 402
412 { 403 {
413 dSP; 404 dSP;
414 CV *cv; 405 CV *cv;
415 406
… …
473 } 464 }
474 465
475 PUTBACK; 466 PUTBACK;
476 } 467 }
477 468
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 469 c->defav = GvAV (PL_defgv);
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 470 c->defsv = DEFSV;
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 471 c->errsv = ERRSV;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 472 c->irssv_sv = GvSV (irsgv);
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
483 473
484#define VAR(name,type)c->name = PL_ ## name; 474#define VAR(name,type)c->name = PL_ ## name;
485# include "state.h" 475# include "state.h"
486#undef VAR 476#undef VAR
487} 477}
… …
540 * destroy the stacks, the callchain etc... 530 * destroy the stacks, the callchain etc...
541 */ 531 */
542static void 532static void
543coro_destroy_stacks (pTHX) 533coro_destroy_stacks (pTHX)
544{ 534{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 535 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 536 PL_curstackinfo = PL_curstackinfo->si_next;
564 537
565 while (PL_curstackinfo) 538 while (PL_curstackinfo)
566 { 539 {
… …
584} 557}
585 558
586static size_t 559static size_t
587coro_rss (pTHX_ struct coro *coro) 560coro_rss (pTHX_ struct coro *coro)
588{ 561{
589 size_t rss = sizeof (coro); 562 size_t rss = sizeof (*coro);
590 563
591 if (coro->mainstack) 564 if (coro->mainstack)
592 { 565 {
593 if (coro->flags & CF_RUNNING) 566 if (coro->flags & CF_RUNNING)
594 { 567 {
… …
596 # include "state.h" 569 # include "state.h"
597 #undef VAR 570 #undef VAR
598 } 571 }
599 572
600 rss += sizeof (coro->curstackinfo); 573 rss += sizeof (coro->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *); 574 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 575 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 576 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 577 rss += coro->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 578 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 579 rss += coro->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 580 rss += coro->savestack_max * sizeof (ANY);
608 581
… …
615} 588}
616 589
617/** coroutine stack handling ************************************************/ 590/** coroutine stack handling ************************************************/
618 591
619static void 592static void
620setup_coro (pTHX_ struct coro *coro) 593coro_setup (pTHX_ struct coro *coro)
621{ 594{
622 /* 595 /*
623 * emulate part of the perl startup here. 596 * emulate part of the perl startup here.
624 */ 597 */
625 coro_init_stacks (aTHX); 598 coro_init_stacks (aTHX);
… …
630 PL_comppad = 0; 603 PL_comppad = 0;
631 PL_curpm = 0; 604 PL_curpm = 0;
632 PL_localizing = 0; 605 PL_localizing = 0;
633 PL_dirty = 0; 606 PL_dirty = 0;
634 PL_restartop = 0; 607 PL_restartop = 0;
608
609 GvSV (PL_defgv) = NEWSV (0, 0);
610 GvAV (PL_defgv) = coro->args; coro->args = 0;
611 GvSV (PL_errgv) = NEWSV (0, 0);
612 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
613 PL_rs = newSVsv (GvSV (irsgv));
614 PL_defoutgv = SvREFCNT_inc (stdoutgv);
635 615
636 { 616 {
637 dSP; 617 dSP;
638 LOGOP myop; 618 LOGOP myop;
639
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642 619
643 Zero (&myop, 1, LOGOP); 620 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 621 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 622 myop.op_flags = OPf_WANT_VOID;
646 623
… …
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 628 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 629 SPAGAIN;
653 } 630 }
654 631
655 ENTER; /* necessary e.g. for dounwind */ 632 ENTER; /* necessary e.g. for dounwind */
633}
634
635static void
636coro_destroy (pTHX_ struct coro *coro)
637{
638 if (!IN_DESTRUCT)
639 {
640 /* restore all saved variables and stuff */
641 LEAVE_SCOPE (0);
642 assert (PL_tmps_floor == -1);
643
644 /* free all temporaries */
645 FREETMPS;
646 assert (PL_tmps_ix == -1);
647
648 /* unwind all extra stacks */
649 POPSTACK_TO (PL_mainstack);
650
651 /* unwind main stack */
652 dounwind (-1);
653 }
654
655 SvREFCNT_dec (GvSV (PL_defgv));
656 SvREFCNT_dec (GvAV (PL_defgv));
657 SvREFCNT_dec (GvSV (PL_errgv));
658 SvREFCNT_dec (PL_defoutgv);
659 SvREFCNT_dec (PL_rs);
660 SvREFCNT_dec (GvSV (irsgv));
661
662 SvREFCNT_dec (coro->saved_deffh);
663 //SvREFCNT_dec (coro->throw);
664
665 coro_destroy_stacks (aTHX);
656} 666}
657 667
658static void 668static void
659free_coro_mortal (pTHX) 669free_coro_mortal (pTHX)
660{ 670{
… …
1009 /* need to start coroutine */ 1019 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1020 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1021 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1022 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1023 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1024 coro_setup (aTHX_ next);
1015 } 1025 }
1016 else 1026 else
1017 { 1027 {
1018 /* coroutine already started */ 1028 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1029 save_perl (aTHX_ prev);
… …
1084 struct coro temp; 1094 struct coro temp;
1085 1095
1086 if (coro->flags & CF_RUNNING) 1096 if (coro->flags & CF_RUNNING)
1087 croak ("FATAL: tried to destroy currently running coroutine"); 1097 croak ("FATAL: tried to destroy currently running coroutine");
1088 1098
1089 Zero (&temp, 1, struct coro);
1090 temp.save = CORO_SAVE_ALL;
1091
1092 save_perl (aTHX_ &temp); 1099 save_perl (aTHX_ &temp);
1093 load_perl (aTHX_ coro); 1100 load_perl (aTHX_ coro);
1094 1101
1095 coro_destroy_stacks (aTHX); 1102 coro_destroy (aTHX_ coro);
1096 1103
1097 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1104 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1098 1105
1099 coro->mainstack = 0; 1106 coro->mainstack = 0;
1100 } 1107 }
… …
1163 1170
1164 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1171 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1165 TRANSFER (ta); 1172 TRANSFER (ta);
1166} 1173}
1167 1174
1168static int
1169api_save (SV *coro_sv, int new_save)
1170{
1171 dTHX;
1172 struct coro *coro = SvSTATE (coro_sv);
1173 int old_save = coro->save;
1174
1175 if (new_save >= 0)
1176 coro->save = new_save;
1177
1178 return old_save;
1179}
1180
1181/** Coro ********************************************************************/ 1175/** Coro ********************************************************************/
1182 1176
1183static void 1177static void
1184coro_enq (pTHX_ SV *coro_sv) 1178coro_enq (pTHX_ SV *coro_sv)
1185{ 1179{
… …
1389#ifdef USE_ITHREADS 1383#ifdef USE_ITHREADS
1390 MUTEX_INIT (&coro_mutex); 1384 MUTEX_INIT (&coro_mutex);
1391#endif 1385#endif
1392 BOOT_PAGESIZE; 1386 BOOT_PAGESIZE;
1393 1387
1388 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1389 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1390
1394 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1391 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1395 1392
1396 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1393 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1397 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1394 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1398 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1395 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1396 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1400 1397
1401 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1402 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1403 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1404 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1406 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1407 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1408
1409 main_mainstack = PL_mainstack; 1398 main_mainstack = PL_mainstack;
1410 main_top_env = PL_top_env; 1399 main_top_env = PL_top_env;
1411 1400
1412 while (main_top_env->je_prev) 1401 while (main_top_env->je_prev)
1413 main_top_env = main_top_env->je_prev; 1402 main_top_env = main_top_env->je_prev;
… …
1425 struct coro *coro; 1414 struct coro *coro;
1426 HV *hv; 1415 HV *hv;
1427 int i; 1416 int i;
1428 1417
1429 Newz (0, coro, 1, struct coro); 1418 Newz (0, coro, 1, struct coro);
1430 coro->args = newAV (); 1419 coro->args = newAV ();
1431 coro->save = CORO_SAVE_DEF;
1432 coro->flags = CF_NEW; 1420 coro->flags = CF_NEW;
1433 1421
1434 if (coro_first) coro_first->prev = coro; 1422 if (coro_first) coro_first->prev = coro;
1435 coro->next = coro_first; 1423 coro->next = coro_first;
1436 coro_first = coro; 1424 coro_first = coro;
… …
1441 1429
1442 for (i = 1; i < items; i++) 1430 for (i = 1; i < items; i++)
1443 av_push (coro->args, newSVsv (ST (i))); 1431 av_push (coro->args, newSVsv (ST (i)));
1444} 1432}
1445 OUTPUT: 1433 OUTPUT:
1446 RETVAL
1447
1448int
1449save (SV *coro, int new_save = -1)
1450 CODE:
1451 RETVAL = api_save (coro, new_save);
1452 OUTPUT:
1453 RETVAL
1454
1455int
1456save_also (SV *coro_sv, int save_also)
1457 CODE:
1458{
1459 struct coro *coro = SvSTATE (coro_sv);
1460 RETVAL = coro->save;
1461 coro->save |= save_also;
1462}
1463 OUTPUT:
1464 RETVAL 1434 RETVAL
1465 1435
1466# these not obviously related functions are all rolled into the same xs 1436# these not obviously related functions are all rolled into the same xs
1467# function to increase chances that they all will call transfer with the same 1437# function to increase chances that they all will call transfer with the same
1468# stack offset 1438# stack offset
… …
1568{ 1538{
1569 if (coro->mainstack) 1539 if (coro->mainstack)
1570 { 1540 {
1571 struct coro temp; 1541 struct coro temp;
1572 Zero (&temp, 1, struct coro); 1542 Zero (&temp, 1, struct coro);
1573 temp.save = CORO_SAVE_ALL;
1574 1543
1575 if (!(coro->flags & CF_RUNNING)) 1544 if (!(coro->flags & CF_RUNNING))
1576 { 1545 {
1577 save_perl (aTHX_ &temp); 1546 save_perl (aTHX_ &temp);
1578 load_perl (aTHX_ coro); 1547 load_perl (aTHX_ coro);
… …
1657 1626
1658 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1659 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1660 av_async_pool = get_av ("Coro::async_pool", TRUE); 1629 av_async_pool = get_av ("Coro::async_pool", TRUE);
1661 1630
1662 coro_current = get_sv ("Coro::current", FALSE); 1631 coro_current = get_sv ("Coro::current", FALSE);
1663 SvREADONLY_on (coro_current); 1632 SvREADONLY_on (coro_current);
1664 1633
1665 coro_stash = gv_stashpv ("Coro", TRUE); 1634 coro_stash = gv_stashpv ("Coro", TRUE);
1666 1635
1667 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1676 1645
1677 { 1646 {
1678 SV *sv = perl_get_sv("Coro::API", 1); 1647 SV *sv = perl_get_sv("Coro::API", 1);
1679 1648
1680 coroapi.schedule = api_schedule; 1649 coroapi.schedule = api_schedule;
1681 coroapi.save = api_save;
1682 coroapi.cede = api_cede; 1650 coroapi.cede = api_cede;
1683 coroapi.cede_notself = api_cede_notself; 1651 coroapi.cede_notself = api_cede_notself;
1684 coroapi.ready = api_ready; 1652 coroapi.ready = api_ready;
1685 coroapi.is_ready = api_is_ready; 1653 coroapi.is_ready = api_is_ready;
1686 coroapi.nready = &coro_nready; 1654 coroapi.nready = &coro_nready;
… …
1740# for async_pool speedup 1708# for async_pool speedup
1741void 1709void
1742_pool_1 (SV *cb) 1710_pool_1 (SV *cb)
1743 CODE: 1711 CODE:
1744{ 1712{
1745 int i, len; 1713 struct coro *coro = SvSTATE (coro_current);
1746 HV *hv = (HV *)SvRV (coro_current); 1714 HV *hv = (HV *)SvRV (coro_current);
1747 AV *defav = GvAV (PL_defgv); 1715 AV *defav = GvAV (PL_defgv);
1748 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1716 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1749 AV *invoke_av; 1717 AV *invoke_av;
1718 int i, len;
1750 1719
1751 if (!invoke) 1720 if (!invoke)
1752 croak ("\3terminate\2\n"); 1721 croak ("\3terminate\2\n");
1722
1723 SvREFCNT_dec (coro->saved_deffh);
1724 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1753 1725
1754 hv_store (hv, "desc", sizeof ("desc") - 1, 1726 hv_store (hv, "desc", sizeof ("desc") - 1,
1755 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1727 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1756 1728
1757 invoke_av = (AV *)SvRV (invoke); 1729 invoke_av = (AV *)SvRV (invoke);
… …
1775{ 1747{
1776 struct coro *coro = SvSTATE (coro_current); 1748 struct coro *coro = SvSTATE (coro_current);
1777 1749
1778 sv_setsv (cb, &PL_sv_undef); 1750 sv_setsv (cb, &PL_sv_undef);
1779 1751
1752 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1753 coro->saved_deffh = 0;
1754
1780 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1755 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1781 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1756 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1782 croak ("\3terminate\2\n"); 1757 croak ("\3terminate\2\n");
1783 1758
1784 av_clear (GvAV (PL_defgv)); 1759 av_clear (GvAV (PL_defgv));
1785 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1760 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1786 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1761 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1787 1762
1788 coro->save = CORO_SAVE_DEF;
1789 coro->prio = 0; 1763 coro->prio = 0;
1790 1764
1791 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1765 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1792 api_trace (coro_current, 0); 1766 api_trace (coro_current, 0);
1793 1767

Diff Legend

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