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.173 by root, Sun Sep 30 13:41:45 2007 UTC vs.
Revision 1.188 by root, Fri Oct 5 20:36:31 2007 UTC

… …
132static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 133static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 134static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 135static SV *coro_mortal; /* will be freed after next transfer */
136 136
137static GV *irsgv; /* $/ */
138static GV *stdoutgv; /* STDOUT */
139
137/* async_pool helper stuff */ 140/* async_pool helper stuff */
138static SV *sv_pool_rss; 141static SV *sv_pool_rss;
139static SV *sv_pool_size; 142static SV *sv_pool_size;
140static AV *av_async_pool; 143static AV *av_async_pool;
141 144
… …
184 coro_cctx *cctx; 187 coro_cctx *cctx;
185 188
186 /* data associated with this coroutine (initial args) */ 189 /* data associated with this coroutine (initial args) */
187 AV *args; 190 AV *args;
188 int refcnt; 191 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 192 int flags; /* CF_ flags */
191 193
192 /* optionally saved, might be zero */ 194 /* optionally saved, might be zero */
193 AV *defav; /* @_ */ 195 AV *defav; /* @_ */
194 SV *defsv; /* $_ */ 196 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */ 197 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */ 198 SV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */ 199 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */ 200 SV *irssv_sv; /* real $/ cache */
199 201
200#define VAR(name,type) type name; 202#define VAR(name,type) type name;
201# include "state.h" 203# include "state.h"
202#undef VAR 204#undef VAR
203 205
204 /* statistics */ 206 /* statistics */
205 int usecount; /* number of switches to this coro */ 207 int usecount; /* number of transfers to this coro */
206 208
207 /* coro process data */ 209 /* coro process data */
208 int prio; 210 int prio;
211 //SV *throw;
212
213 /* async_pool */
214 SV *saved_deffh;
209 215
210 /* linked list */ 216 /* linked list */
211 struct coro *next, *prev; 217 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */ 218 HV *hv; /* the perl hash associated with this coro, if any */
213}; 219};
… …
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 381 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 382}
377 383
378/** load & save, init *******************************************************/ 384/** load & save, init *******************************************************/
379 385
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 386static void
386load_perl (pTHX_ Coro__State c) 387load_perl (pTHX_ Coro__State c)
387{ 388{
388#define VAR(name,type) PL_ ## name = c->name; 389#define VAR(name,type) PL_ ## name = c->name;
389# include "state.h" 390# include "state.h"
390#undef VAR 391#undef VAR
391 392
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 393 GvSV (PL_defgv) = c->defsv;
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 394 GvAV (PL_defgv) = c->defav;
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 395 GvSV (PL_errgv) = c->errsv;
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 396 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 397
412 { 398 {
413 dSP; 399 dSP;
414 CV *cv; 400 CV *cv;
415 401
… …
473 } 459 }
474 460
475 PUTBACK; 461 PUTBACK;
476 } 462 }
477 463
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 464 c->defav = GvAV (PL_defgv);
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 465 c->defsv = DEFSV;
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 466 c->errsv = ERRSV;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 467 c->irssv_sv = GvSV (irsgv);
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
483 468
484#define VAR(name,type)c->name = PL_ ## name; 469#define VAR(name,type)c->name = PL_ ## name;
485# include "state.h" 470# include "state.h"
486#undef VAR 471#undef VAR
487} 472}
… …
540 * destroy the stacks, the callchain etc... 525 * destroy the stacks, the callchain etc...
541 */ 526 */
542static void 527static void
543coro_destroy_stacks (pTHX) 528coro_destroy_stacks (pTHX)
544{ 529{
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) 530 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 531 PL_curstackinfo = PL_curstackinfo->si_next;
564 532
565 while (PL_curstackinfo) 533 while (PL_curstackinfo)
566 { 534 {
… …
584} 552}
585 553
586static size_t 554static size_t
587coro_rss (pTHX_ struct coro *coro) 555coro_rss (pTHX_ struct coro *coro)
588{ 556{
589 size_t rss = sizeof (coro); 557 size_t rss = sizeof (*coro);
590 558
591 if (coro->mainstack) 559 if (coro->mainstack)
592 { 560 {
593 if (coro->flags & CF_RUNNING) 561 if (coro->flags & CF_RUNNING)
594 { 562 {
… …
596 # include "state.h" 564 # include "state.h"
597 #undef VAR 565 #undef VAR
598 } 566 }
599 567
600 rss += sizeof (coro->curstackinfo); 568 rss += sizeof (coro->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *); 569 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 570 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 571 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 572 rss += coro->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 573 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 574 rss += coro->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 575 rss += coro->savestack_max * sizeof (ANY);
608 576
… …
615} 583}
616 584
617/** coroutine stack handling ************************************************/ 585/** coroutine stack handling ************************************************/
618 586
619static void 587static void
620setup_coro (pTHX_ struct coro *coro) 588coro_setup (pTHX_ struct coro *coro)
621{ 589{
622 /* 590 /*
623 * emulate part of the perl startup here. 591 * emulate part of the perl startup here.
624 */ 592 */
625 coro_init_stacks (aTHX); 593 coro_init_stacks (aTHX);
… …
630 PL_comppad = 0; 598 PL_comppad = 0;
631 PL_curpm = 0; 599 PL_curpm = 0;
632 PL_localizing = 0; 600 PL_localizing = 0;
633 PL_dirty = 0; 601 PL_dirty = 0;
634 PL_restartop = 0; 602 PL_restartop = 0;
603
604 GvSV (PL_defgv) = NEWSV (0, 0);
605 GvAV (PL_defgv) = coro->args; coro->args = 0;
606 GvSV (PL_errgv) = NEWSV (0, 0);
607 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
608 PL_rs = newSVsv (GvSV (irsgv));
609 PL_defoutgv = SvREFCNT_inc (stdoutgv);
635 610
636 { 611 {
637 dSP; 612 dSP;
638 LOGOP myop; 613 LOGOP myop;
639
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642 614
643 Zero (&myop, 1, LOGOP); 615 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 616 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 617 myop.op_flags = OPf_WANT_VOID;
646 618
… …
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 623 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 624 SPAGAIN;
653 } 625 }
654 626
655 ENTER; /* necessary e.g. for dounwind */ 627 ENTER; /* necessary e.g. for dounwind */
628}
629
630static void
631coro_destroy (pTHX_ struct coro *coro)
632{
633 if (!IN_DESTRUCT)
634 {
635 /* restore all saved variables and stuff */
636 LEAVE_SCOPE (0);
637 assert (PL_tmps_floor == -1);
638
639 /* free all temporaries */
640 FREETMPS;
641 assert (PL_tmps_ix == -1);
642
643 /* unwind all extra stacks */
644 POPSTACK_TO (PL_mainstack);
645
646 /* unwind main stack */
647 dounwind (-1);
648 }
649
650 SvREFCNT_dec (GvSV (PL_defgv));
651 SvREFCNT_dec (GvAV (PL_defgv));
652 SvREFCNT_dec (GvSV (PL_errgv));
653 SvREFCNT_dec (PL_defoutgv);
654 SvREFCNT_dec (PL_rs);
655 SvREFCNT_dec (GvSV (irsgv));
656
657 SvREFCNT_dec (coro->saved_deffh);
658 //SvREFCNT_dec (coro->throw);
659
660 coro_destroy_stacks (aTHX);
656} 661}
657 662
658static void 663static void
659free_coro_mortal (pTHX) 664free_coro_mortal (pTHX)
660{ 665{
… …
1009 /* need to start coroutine */ 1014 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1015 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1016 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1017 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1018 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1019 coro_setup (aTHX_ next);
1015 } 1020 }
1016 else 1021 else
1017 { 1022 {
1018 /* coroutine already started */ 1023 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1024 save_perl (aTHX_ prev);
… …
1081 1086
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1087 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1088 {
1084 struct coro temp; 1089 struct coro temp;
1085 1090
1086 assert (!(coro->flags & CF_RUNNING));
1087
1088 Zero (&temp, 1, struct coro);
1089 temp.save = CORO_SAVE_ALL;
1090
1091 if (coro->flags & CF_RUNNING) 1091 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1092 croak ("FATAL: tried to destroy currently running coroutine");
1093 1093
1094 save_perl (aTHX_ &temp); 1094 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1095 load_perl (aTHX_ coro);
1096 1096
1097 coro_destroy_stacks (aTHX); 1097 coro_destroy (aTHX_ coro);
1098 1098
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1100 1100
1101 coro->mainstack = 0; 1101 coro->mainstack = 0;
1102 } 1102 }
… …
1165 1165
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1167 TRANSFER (ta);
1168} 1168}
1169 1169
1170static int
1171api_save (SV *coro_sv, int new_save)
1172{
1173 dTHX;
1174 struct coro *coro = SvSTATE (coro_sv);
1175 int old_save = coro->save;
1176
1177 if (new_save >= 0)
1178 coro->save = new_save;
1179
1180 return old_save;
1181}
1182
1183/** Coro ********************************************************************/ 1170/** Coro ********************************************************************/
1184 1171
1185static void 1172static void
1186coro_enq (pTHX_ SV *coro_sv) 1173coro_enq (pTHX_ SV *coro_sv)
1187{ 1174{
… …
1355 else 1342 else
1356 return 0; 1343 return 0;
1357} 1344}
1358 1345
1359static void 1346static void
1360api_trace (struct coro *coro, int flags) 1347api_trace (SV *coro_sv, int flags)
1361{ 1348{
1362 dTHX; 1349 dTHX;
1350 struct coro *coro = SvSTATE (coro_sv);
1363 1351
1364 if (flags & CC_TRACE) 1352 if (flags & CC_TRACE)
1365 { 1353 {
1366 if (!coro->cctx) 1354 if (!coro->cctx)
1367 coro->cctx = cctx_new (); 1355 coro->cctx = cctx_new ();
… …
1390#ifdef USE_ITHREADS 1378#ifdef USE_ITHREADS
1391 MUTEX_INIT (&coro_mutex); 1379 MUTEX_INIT (&coro_mutex);
1392#endif 1380#endif
1393 BOOT_PAGESIZE; 1381 BOOT_PAGESIZE;
1394 1382
1383 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1384 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1385
1395 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1386 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1396 1387
1397 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1388 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1398 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1389 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1390 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1391 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1401 1392
1402 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1403 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1404 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1406 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1407 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1408 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1409
1410 main_mainstack = PL_mainstack; 1393 main_mainstack = PL_mainstack;
1411 main_top_env = PL_top_env; 1394 main_top_env = PL_top_env;
1412 1395
1413 while (main_top_env->je_prev) 1396 while (main_top_env->je_prev)
1414 main_top_env = main_top_env->je_prev; 1397 main_top_env = main_top_env->je_prev;
… …
1426 struct coro *coro; 1409 struct coro *coro;
1427 HV *hv; 1410 HV *hv;
1428 int i; 1411 int i;
1429 1412
1430 Newz (0, coro, 1, struct coro); 1413 Newz (0, coro, 1, struct coro);
1431 coro->args = newAV (); 1414 coro->args = newAV ();
1432 coro->save = CORO_SAVE_DEF;
1433 coro->flags = CF_NEW; 1415 coro->flags = CF_NEW;
1434 1416
1435 if (coro_first) coro_first->prev = coro; 1417 if (coro_first) coro_first->prev = coro;
1436 coro->next = coro_first; 1418 coro->next = coro_first;
1437 coro_first = coro; 1419 coro_first = coro;
… …
1444 av_push (coro->args, newSVsv (ST (i))); 1426 av_push (coro->args, newSVsv (ST (i)));
1445} 1427}
1446 OUTPUT: 1428 OUTPUT:
1447 RETVAL 1429 RETVAL
1448 1430
1449int 1431# these not obviously related functions are all rolled into the same xs
1450save (SV *coro, int new_save = -1) 1432# function to increase chances that they all will call transfer with the same
1451 CODE: 1433# stack offset
1452 RETVAL = api_save (coro, new_save);
1453 OUTPUT:
1454 RETVAL
1455
1456int
1457save_also (SV *coro_sv, int save_also)
1458 CODE:
1459{
1460 struct coro *coro = SvSTATE (coro_sv);
1461 RETVAL = coro->save;
1462 coro->save |= save_also;
1463}
1464 OUTPUT:
1465 RETVAL
1466
1467void 1434void
1468_set_stacklevel (...) 1435_set_stacklevel (...)
1469 ALIAS: 1436 ALIAS:
1470 Coro::State::transfer = 1 1437 Coro::State::transfer = 1
1471 Coro::schedule = 2 1438 Coro::schedule = 2
… …
1566{ 1533{
1567 if (coro->mainstack) 1534 if (coro->mainstack)
1568 { 1535 {
1569 struct coro temp; 1536 struct coro temp;
1570 Zero (&temp, 1, struct coro); 1537 Zero (&temp, 1, struct coro);
1571 temp.save = CORO_SAVE_ALL;
1572 1538
1573 if (!(coro->flags & CF_RUNNING)) 1539 if (!(coro->flags & CF_RUNNING))
1574 { 1540 {
1575 save_perl (aTHX_ &temp); 1541 save_perl (aTHX_ &temp);
1576 load_perl (aTHX_ coro); 1542 load_perl (aTHX_ coro);
… …
1612 RETVAL = boolSV (coro->flags & ix); 1578 RETVAL = boolSV (coro->flags & ix);
1613 OUTPUT: 1579 OUTPUT:
1614 RETVAL 1580 RETVAL
1615 1581
1616void 1582void
1617api_trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1583api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1618 1584
1619SV * 1585SV *
1620has_stack (Coro::State coro) 1586has_stack (Coro::State coro)
1621 PROTOTYPE: $ 1587 PROTOTYPE: $
1622 CODE: 1588 CODE:
… …
1655 1621
1656 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1622 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1657 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1623 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1658 av_async_pool = get_av ("Coro::async_pool", TRUE); 1624 av_async_pool = get_av ("Coro::async_pool", TRUE);
1659 1625
1660 coro_current = get_sv ("Coro::current", FALSE); 1626 coro_current = get_sv ("Coro::current", FALSE);
1661 SvREADONLY_on (coro_current); 1627 SvREADONLY_on (coro_current);
1662 1628
1663 coro_stash = gv_stashpv ("Coro", TRUE); 1629 coro_stash = gv_stashpv ("Coro", TRUE);
1664 1630
1665 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1631 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1674 1640
1675 { 1641 {
1676 SV *sv = perl_get_sv("Coro::API", 1); 1642 SV *sv = perl_get_sv("Coro::API", 1);
1677 1643
1678 coroapi.schedule = api_schedule; 1644 coroapi.schedule = api_schedule;
1679 coroapi.save = api_save;
1680 coroapi.cede = api_cede; 1645 coroapi.cede = api_cede;
1681 coroapi.cede_notself = api_cede_notself; 1646 coroapi.cede_notself = api_cede_notself;
1682 coroapi.ready = api_ready; 1647 coroapi.ready = api_ready;
1683 coroapi.is_ready = api_is_ready; 1648 coroapi.is_ready = api_is_ready;
1684 coroapi.nready = &coro_nready; 1649 coroapi.nready = &coro_nready;
… …
1738# for async_pool speedup 1703# for async_pool speedup
1739void 1704void
1740_pool_1 (SV *cb) 1705_pool_1 (SV *cb)
1741 CODE: 1706 CODE:
1742{ 1707{
1743 int i, len; 1708 struct coro *coro = SvSTATE (coro_current);
1744 HV *hv = (HV *)SvRV (coro_current); 1709 HV *hv = (HV *)SvRV (coro_current);
1745 AV *defav = GvAV (PL_defgv); 1710 AV *defav = GvAV (PL_defgv);
1746 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1711 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1747 AV *invoke_av; 1712 AV *invoke_av;
1713 int i, len;
1748 1714
1749 if (!invoke) 1715 if (!invoke)
1750 croak ("\3terminate\2\n"); 1716 croak ("\3terminate\2\n");
1717
1718 SvREFCNT_dec (coro->saved_deffh);
1719 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1751 1720
1752 hv_store (hv, "desc", sizeof ("desc") - 1, 1721 hv_store (hv, "desc", sizeof ("desc") - 1,
1753 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1722 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1754 1723
1755 invoke_av = (AV *)SvRV (invoke); 1724 invoke_av = (AV *)SvRV (invoke);
… …
1773{ 1742{
1774 struct coro *coro = SvSTATE (coro_current); 1743 struct coro *coro = SvSTATE (coro_current);
1775 1744
1776 sv_setsv (cb, &PL_sv_undef); 1745 sv_setsv (cb, &PL_sv_undef);
1777 1746
1747 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1748 coro->saved_deffh = 0;
1749
1778 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1750 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1779 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1751 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1780 croak ("\3terminate\2\n"); 1752 croak ("\3terminate\2\n");
1781 1753
1782 av_clear (GvAV (PL_defgv)); 1754 av_clear (GvAV (PL_defgv));
1783 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1755 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1784 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1756 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1785 coro->save = CORO_SAVE_DEF; 1757
1786 coro->prio = 0; 1758 coro->prio = 0;
1787 1759
1788 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1760 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1789 api_trace (coro, 0); 1761 api_trace (coro_current, 0);
1790 1762
1791 av_push (av_async_pool, newSVsv (coro_current)); 1763 av_push (av_async_pool, newSVsv (coro_current));
1792} 1764}
1793 1765
1794 1766

Diff Legend

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