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.186 by root, Fri Oct 5 20:10:42 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; /* $/ */
138
137/* async_pool helper stuff */ 139/* async_pool helper stuff */
138static SV *sv_pool_rss; 140static SV *sv_pool_rss;
139static SV *sv_pool_size; 141static SV *sv_pool_size;
140static AV *av_async_pool; 142static AV *av_async_pool;
141 143
… …
184 coro_cctx *cctx; 186 coro_cctx *cctx;
185 187
186 /* data associated with this coroutine (initial args) */ 188 /* data associated with this coroutine (initial args) */
187 AV *args; 189 AV *args;
188 int refcnt; 190 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 191 int flags; /* CF_ flags */
191 192
192 /* optionally saved, might be zero */ 193 /* optionally saved, might be zero */
193 AV *defav; /* @_ */ 194 AV *defav; /* @_ */
194 SV *defsv; /* $_ */ 195 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */ 196 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */ 197 SV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */ 198 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */ 199 SV *irssv_sv; /* real $/ cache */
199 200
200#define VAR(name,type) type name; 201#define VAR(name,type) type name;
201# include "state.h" 202# include "state.h"
202#undef VAR 203#undef VAR
203 204
204 /* statistics */ 205 /* statistics */
205 int usecount; /* number of switches to this coro */ 206 int usecount; /* number of transfers to this coro */
206 207
207 /* coro process data */ 208 /* coro process data */
208 int prio; 209 int prio;
210 //SV *throw;
211
212 /* async_pool */
213 SV *saved_deffh;
209 214
210 /* linked list */ 215 /* linked list */
211 struct coro *next, *prev; 216 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */ 217 HV *hv; /* the perl hash associated with this coro, if any */
213}; 218};
… …
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 381}
377 382
378/** load & save, init *******************************************************/ 383/** load & save, init *******************************************************/
379 384
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 385static void
386load_perl (pTHX_ Coro__State c) 386load_perl (pTHX_ Coro__State c)
387{ 387{
388#define VAR(name,type) PL_ ## name = c->name; 388#define VAR(name,type) PL_ ## name = c->name;
389# include "state.h" 389# include "state.h"
390#undef VAR 390#undef VAR
391 391
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 392 GvSV (PL_defgv) = c->defsv;
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 393 GvAV (PL_defgv) = c->defav;
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 394 GvSV (PL_errgv) = c->errsv;
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 395 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 396
412 { 397 {
413 dSP; 398 dSP;
414 CV *cv; 399 CV *cv;
415 400
… …
473 } 458 }
474 459
475 PUTBACK; 460 PUTBACK;
476 } 461 }
477 462
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 463 c->defav = GvAV (PL_defgv);
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 464 c->defsv = DEFSV;
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 465 c->errsv = ERRSV;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 466 c->irssv_sv = GvSV (irsgv);
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
483 467
484#define VAR(name,type)c->name = PL_ ## name; 468#define VAR(name,type)c->name = PL_ ## name;
485# include "state.h" 469# include "state.h"
486#undef VAR 470#undef VAR
487} 471}
… …
540 * destroy the stacks, the callchain etc... 524 * destroy the stacks, the callchain etc...
541 */ 525 */
542static void 526static void
543coro_destroy_stacks (pTHX) 527coro_destroy_stacks (pTHX)
544{ 528{
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) 529 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 530 PL_curstackinfo = PL_curstackinfo->si_next;
564 531
565 while (PL_curstackinfo) 532 while (PL_curstackinfo)
566 { 533 {
… …
584} 551}
585 552
586static size_t 553static size_t
587coro_rss (pTHX_ struct coro *coro) 554coro_rss (pTHX_ struct coro *coro)
588{ 555{
589 size_t rss = sizeof (coro); 556 size_t rss = sizeof (*coro);
590 557
591 if (coro->mainstack) 558 if (coro->mainstack)
592 { 559 {
593 if (coro->flags & CF_RUNNING) 560 if (coro->flags & CF_RUNNING)
594 { 561 {
… …
596 # include "state.h" 563 # include "state.h"
597 #undef VAR 564 #undef VAR
598 } 565 }
599 566
600 rss += sizeof (coro->curstackinfo); 567 rss += sizeof (coro->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *); 568 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 570 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 571 rss += coro->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 573 rss += coro->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 574 rss += coro->savestack_max * sizeof (ANY);
608 575
… …
615} 582}
616 583
617/** coroutine stack handling ************************************************/ 584/** coroutine stack handling ************************************************/
618 585
619static void 586static void
620setup_coro (pTHX_ struct coro *coro) 587coro_setup (pTHX_ struct coro *coro)
621{ 588{
622 /* 589 /*
623 * emulate part of the perl startup here. 590 * emulate part of the perl startup here.
624 */ 591 */
625 coro_init_stacks (aTHX); 592 coro_init_stacks (aTHX);
… …
630 PL_comppad = 0; 597 PL_comppad = 0;
631 PL_curpm = 0; 598 PL_curpm = 0;
632 PL_localizing = 0; 599 PL_localizing = 0;
633 PL_dirty = 0; 600 PL_dirty = 0;
634 PL_restartop = 0; 601 PL_restartop = 0;
602
603 GvSV (PL_defgv) = NEWSV (0, 0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0);
606 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
607 PL_rs = newSVsv (GvSV (irsgv));
608
609 {
610 IO *io = newIO ();
611 PL_defoutgv = (GV *)NEWSV (0, 0);
612 gv_init (PL_defoutgv, coro_state_stash, "stdout", sizeof ("stdout") - 1, 0);
613 IoTYPE (io) = IoTYPE_WRONLY;
614 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
615 IoFLAGS (io) |= IOf_FLUSH;
616 GvIOp (PL_defoutgv) = io;
617 }
635 618
636 { 619 {
637 dSP; 620 dSP;
638 LOGOP myop; 621 LOGOP myop;
639
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642 622
643 Zero (&myop, 1, LOGOP); 623 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 624 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 625 myop.op_flags = OPf_WANT_VOID;
646 626
… …
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 631 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 632 SPAGAIN;
653 } 633 }
654 634
655 ENTER; /* necessary e.g. for dounwind */ 635 ENTER; /* necessary e.g. for dounwind */
636}
637
638static void
639coro_destroy (pTHX_ struct coro *coro)
640{
641 if (!IN_DESTRUCT)
642 {
643 /* restore all saved variables and stuff */
644 LEAVE_SCOPE (0);
645 assert (PL_tmps_floor == -1);
646
647 /* free all temporaries */
648 FREETMPS;
649 assert (PL_tmps_ix == -1);
650
651 /* unwind all extra stacks */
652 POPSTACK_TO (PL_mainstack);
653
654 /* unwind main stack */
655 dounwind (-1);
656 }
657
658 SvREFCNT_dec (GvSV (PL_defgv));
659 SvREFCNT_dec (GvAV (PL_defgv));
660 SvREFCNT_dec (GvSV (PL_errgv));
661 SvREFCNT_dec (PL_defoutgv);
662 SvREFCNT_dec (PL_rs);
663 SvREFCNT_dec (GvSV (irsgv));
664
665 SvREFCNT_dec (coro->saved_deffh);
666 //SvREFCNT_dec (coro->throw);
667
668 coro_destroy_stacks (aTHX);
656} 669}
657 670
658static void 671static void
659free_coro_mortal (pTHX) 672free_coro_mortal (pTHX)
660{ 673{
… …
1009 /* need to start coroutine */ 1022 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1023 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1024 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1025 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1026 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1027 coro_setup (aTHX_ next);
1015 } 1028 }
1016 else 1029 else
1017 { 1030 {
1018 /* coroutine already started */ 1031 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1032 save_perl (aTHX_ prev);
… …
1081 1094
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1095 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1096 {
1084 struct coro temp; 1097 struct coro temp;
1085 1098
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) 1099 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1100 croak ("FATAL: tried to destroy currently running coroutine");
1093 1101
1094 save_perl (aTHX_ &temp); 1102 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1103 load_perl (aTHX_ coro);
1096 1104
1097 coro_destroy_stacks (aTHX); 1105 coro_destroy (aTHX_ coro);
1098 1106
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1107 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1100 1108
1101 coro->mainstack = 0; 1109 coro->mainstack = 0;
1102 } 1110 }
… …
1165 1173
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1174 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1175 TRANSFER (ta);
1168} 1176}
1169 1177
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 ********************************************************************/ 1178/** Coro ********************************************************************/
1184 1179
1185static void 1180static void
1186coro_enq (pTHX_ SV *coro_sv) 1181coro_enq (pTHX_ SV *coro_sv)
1187{ 1182{
… …
1355 else 1350 else
1356 return 0; 1351 return 0;
1357} 1352}
1358 1353
1359static void 1354static void
1360api_trace (struct coro *coro, int flags) 1355api_trace (SV *coro_sv, int flags)
1361{ 1356{
1362 dTHX; 1357 dTHX;
1358 struct coro *coro = SvSTATE (coro_sv);
1363 1359
1364 if (flags & CC_TRACE) 1360 if (flags & CC_TRACE)
1365 { 1361 {
1366 if (!coro->cctx) 1362 if (!coro->cctx)
1367 coro->cctx = cctx_new (); 1363 coro->cctx = cctx_new ();
… …
1390#ifdef USE_ITHREADS 1386#ifdef USE_ITHREADS
1391 MUTEX_INIT (&coro_mutex); 1387 MUTEX_INIT (&coro_mutex);
1392#endif 1388#endif
1393 BOOT_PAGESIZE; 1389 BOOT_PAGESIZE;
1394 1390
1391 irsgv = gv_fetchpv ("/", 1, SVt_PV);
1392
1395 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1393 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1396 1394
1397 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1395 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1398 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1396 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1397 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1398 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1401 1399
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; 1400 main_mainstack = PL_mainstack;
1411 main_top_env = PL_top_env; 1401 main_top_env = PL_top_env;
1412 1402
1413 while (main_top_env->je_prev) 1403 while (main_top_env->je_prev)
1414 main_top_env = main_top_env->je_prev; 1404 main_top_env = main_top_env->je_prev;
… …
1426 struct coro *coro; 1416 struct coro *coro;
1427 HV *hv; 1417 HV *hv;
1428 int i; 1418 int i;
1429 1419
1430 Newz (0, coro, 1, struct coro); 1420 Newz (0, coro, 1, struct coro);
1431 coro->args = newAV (); 1421 coro->args = newAV ();
1432 coro->save = CORO_SAVE_DEF;
1433 coro->flags = CF_NEW; 1422 coro->flags = CF_NEW;
1434 1423
1435 if (coro_first) coro_first->prev = coro; 1424 if (coro_first) coro_first->prev = coro;
1436 coro->next = coro_first; 1425 coro->next = coro_first;
1437 coro_first = coro; 1426 coro_first = coro;
… …
1444 av_push (coro->args, newSVsv (ST (i))); 1433 av_push (coro->args, newSVsv (ST (i)));
1445} 1434}
1446 OUTPUT: 1435 OUTPUT:
1447 RETVAL 1436 RETVAL
1448 1437
1449int 1438# these not obviously related functions are all rolled into the same xs
1450save (SV *coro, int new_save = -1) 1439# function to increase chances that they all will call transfer with the same
1451 CODE: 1440# 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 1441void
1468_set_stacklevel (...) 1442_set_stacklevel (...)
1469 ALIAS: 1443 ALIAS:
1470 Coro::State::transfer = 1 1444 Coro::State::transfer = 1
1471 Coro::schedule = 2 1445 Coro::schedule = 2
… …
1566{ 1540{
1567 if (coro->mainstack) 1541 if (coro->mainstack)
1568 { 1542 {
1569 struct coro temp; 1543 struct coro temp;
1570 Zero (&temp, 1, struct coro); 1544 Zero (&temp, 1, struct coro);
1571 temp.save = CORO_SAVE_ALL;
1572 1545
1573 if (!(coro->flags & CF_RUNNING)) 1546 if (!(coro->flags & CF_RUNNING))
1574 { 1547 {
1575 save_perl (aTHX_ &temp); 1548 save_perl (aTHX_ &temp);
1576 load_perl (aTHX_ coro); 1549 load_perl (aTHX_ coro);
… …
1612 RETVAL = boolSV (coro->flags & ix); 1585 RETVAL = boolSV (coro->flags & ix);
1613 OUTPUT: 1586 OUTPUT:
1614 RETVAL 1587 RETVAL
1615 1588
1616void 1589void
1617api_trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1590api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1618 1591
1619SV * 1592SV *
1620has_stack (Coro::State coro) 1593has_stack (Coro::State coro)
1621 PROTOTYPE: $ 1594 PROTOTYPE: $
1622 CODE: 1595 CODE:
… …
1655 1628
1656 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1629 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1657 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1630 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1658 av_async_pool = get_av ("Coro::async_pool", TRUE); 1631 av_async_pool = get_av ("Coro::async_pool", TRUE);
1659 1632
1660 coro_current = get_sv ("Coro::current", FALSE); 1633 coro_current = get_sv ("Coro::current", FALSE);
1661 SvREADONLY_on (coro_current); 1634 SvREADONLY_on (coro_current);
1662 1635
1663 coro_stash = gv_stashpv ("Coro", TRUE); 1636 coro_stash = gv_stashpv ("Coro", TRUE);
1664 1637
1665 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1638 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1674 1647
1675 { 1648 {
1676 SV *sv = perl_get_sv("Coro::API", 1); 1649 SV *sv = perl_get_sv("Coro::API", 1);
1677 1650
1678 coroapi.schedule = api_schedule; 1651 coroapi.schedule = api_schedule;
1679 coroapi.save = api_save;
1680 coroapi.cede = api_cede; 1652 coroapi.cede = api_cede;
1681 coroapi.cede_notself = api_cede_notself; 1653 coroapi.cede_notself = api_cede_notself;
1682 coroapi.ready = api_ready; 1654 coroapi.ready = api_ready;
1683 coroapi.is_ready = api_is_ready; 1655 coroapi.is_ready = api_is_ready;
1684 coroapi.nready = &coro_nready; 1656 coroapi.nready = &coro_nready;
… …
1738# for async_pool speedup 1710# for async_pool speedup
1739void 1711void
1740_pool_1 (SV *cb) 1712_pool_1 (SV *cb)
1741 CODE: 1713 CODE:
1742{ 1714{
1743 int i, len; 1715 struct coro *coro = SvSTATE (coro_current);
1744 HV *hv = (HV *)SvRV (coro_current); 1716 HV *hv = (HV *)SvRV (coro_current);
1745 AV *defav = GvAV (PL_defgv); 1717 AV *defav = GvAV (PL_defgv);
1746 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1718 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1747 AV *invoke_av; 1719 AV *invoke_av;
1720 int i, len;
1748 1721
1749 if (!invoke) 1722 if (!invoke)
1750 croak ("\3terminate\2\n"); 1723 croak ("\3terminate\2\n");
1724
1725 SvREFCNT_dec (coro->saved_deffh);
1726 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1751 1727
1752 hv_store (hv, "desc", sizeof ("desc") - 1, 1728 hv_store (hv, "desc", sizeof ("desc") - 1,
1753 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1729 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1754 1730
1755 invoke_av = (AV *)SvRV (invoke); 1731 invoke_av = (AV *)SvRV (invoke);
… …
1773{ 1749{
1774 struct coro *coro = SvSTATE (coro_current); 1750 struct coro *coro = SvSTATE (coro_current);
1775 1751
1776 sv_setsv (cb, &PL_sv_undef); 1752 sv_setsv (cb, &PL_sv_undef);
1777 1753
1754 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1755 coro->saved_deffh = 0;
1756
1778 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1757 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1779 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1758 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1780 croak ("\3terminate\2\n"); 1759 croak ("\3terminate\2\n");
1781 1760
1782 av_clear (GvAV (PL_defgv)); 1761 av_clear (GvAV (PL_defgv));
1783 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1762 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1784 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1763 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1785 coro->save = CORO_SAVE_DEF; 1764
1786 coro->prio = 0; 1765 coro->prio = 0;
1787 1766
1788 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1767 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1789 api_trace (coro, 0); 1768 api_trace (coro_current, 0);
1790 1769
1791 av_push (av_async_pool, newSVsv (coro_current)); 1770 av_push (av_async_pool, newSVsv (coro_current));
1792} 1771}
1793 1772
1794 1773

Diff Legend

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