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.183 by root, Wed Oct 3 19:19:06 2007 UTC

… …
192 192
193 /* optionally saved, might be zero */ 193 /* optionally saved, might be zero */
194 AV *defav; /* @_ */ 194 AV *defav; /* @_ */
195 SV *defsv; /* $_ */ 195 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */ 196 SV *errsv; /* $@ */
197 IO *deffh; /* default filehandle */ 197 GV *deffh; /* default filehandle */
198 SV *irssv; /* $/ */ 198 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */ 199 SV *irssv_sv; /* real $/ cache */
200 200
201#define VAR(name,type) type name; 201#define VAR(name,type) type name;
202# include "state.h" 202# include "state.h"
203#undef VAR 203#undef VAR
204 204
205 /* statistics */ 205 /* statistics */
206 int usecount; /* number of switches to this coro */ 206 int usecount; /* number of transfers to this coro */
207 207
208 /* coro process data */ 208 /* coro process data */
209 int prio; 209 int prio;
210 //SV *throw;
211
212 /* async_pool */
213 GV *asp_deffh;
210 214
211 /* linked list */ 215 /* linked list */
212 struct coro *next, *prev; 216 struct coro *next, *prev;
213 HV *hv; /* the perl hash associated with this coro, if any */ 217 HV *hv; /* the perl hash associated with this coro, if any */
214}; 218};
… …
383{ 387{
384#define VAR(name,type) PL_ ## name = c->name; 388#define VAR(name,type) PL_ ## name = c->name;
385# include "state.h" 389# include "state.h"
386#undef VAR 390#undef VAR
387 391
388 GvSV (PL_defgv) = c->defsv; 392 GvSV (PL_defgv) = c->defsv;
389 GvAV (PL_defgv) = c->defav; 393 GvAV (PL_defgv) = c->defav;
390 GvSV (PL_errgv) = c->errsv; 394 GvSV (PL_errgv) = c->errsv;
391 GvIOp(PL_defoutgv) = c->deffh; 395 PL_defoutgv = c->deffh;
392 PL_rs = c->irssv; 396 PL_rs = c->irssv;
393 GvSV (irsgv) = c->irssv_sv; 397 GvSV (irsgv) = c->irssv_sv;
394 398
395 { 399 {
396 dSP; 400 dSP;
397 CV *cv; 401 CV *cv;
398 402
… …
459 } 463 }
460 464
461 c->defav = GvAV (PL_defgv); 465 c->defav = GvAV (PL_defgv);
462 c->defsv = DEFSV; 466 c->defsv = DEFSV;
463 c->errsv = ERRSV; 467 c->errsv = ERRSV;
464 c->deffh = GvIOp (PL_defoutgv); 468 c->deffh = PL_defoutgv;
465 c->irssv = PL_rs; 469 c->irssv = PL_rs;
466 c->irssv_sv = GvSV (irsgv); 470 c->irssv_sv = GvSV (irsgv);
467 471
468#define VAR(name,type)c->name = PL_ ## name; 472#define VAR(name,type)c->name = PL_ ## name;
469# include "state.h" 473# include "state.h"
… …
551} 555}
552 556
553static size_t 557static size_t
554coro_rss (pTHX_ struct coro *coro) 558coro_rss (pTHX_ struct coro *coro)
555{ 559{
556 size_t rss = sizeof (coro); 560 size_t rss = sizeof (*coro);
557 561
558 if (coro->mainstack) 562 if (coro->mainstack)
559 { 563 {
560 if (coro->flags & CF_RUNNING) 564 if (coro->flags & CF_RUNNING)
561 { 565 {
… …
582} 586}
583 587
584/** coroutine stack handling ************************************************/ 588/** coroutine stack handling ************************************************/
585 589
586static void 590static void
587setup_coro (pTHX_ struct coro *coro) 591coro_setup (pTHX_ struct coro *coro)
588{ 592{
589 /* 593 /*
590 * emulate part of the perl startup here. 594 * emulate part of the perl startup here.
591 */ 595 */
592 coro_init_stacks (aTHX); 596 coro_init_stacks (aTHX);
… …
601 PL_restartop = 0; 605 PL_restartop = 0;
602 606
603 GvSV (PL_defgv) = NEWSV (0, 0); 607 GvSV (PL_defgv) = NEWSV (0, 0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 608 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 609 GvSV (PL_errgv) = NEWSV (0, 0);
606 GvSV (irsgv) = newSVsv (PL_rs); 610 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
607 PL_rs = newSVpvn ("\n", 1); 611 PL_rs = newSVsv (GvSV (irsgv));
608 612
609 { 613 {
610 IO *io = newIO (); 614 IO *io = newIO ();
615 PL_defoutgv = newGVgen ("Coro");
611 GvIOp(PL_defoutgv) = io; 616 GvIOp(PL_defoutgv) = io;
612 IoTYPE (io) = IoTYPE_WRONLY; 617 IoTYPE (io) = IoTYPE_WRONLY;
613 IoOFP (io) = IoIFP (io) = PerlIO_stdout (); 618 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
614 IoFLAGS (io) |= IOf_FLUSH; 619 IoFLAGS (io) |= IOf_FLUSH;
615 } 620 }
… …
632 637
633 ENTER; /* necessary e.g. for dounwind */ 638 ENTER; /* necessary e.g. for dounwind */
634} 639}
635 640
636static void 641static void
637destroy_coro (pTHX_ struct coro *coro) 642coro_destroy (pTHX_ struct coro *coro)
638{ 643{
639 if (!IN_DESTRUCT) 644 if (!IN_DESTRUCT)
640 { 645 {
641 /* restore all saved variables and stuff */ 646 /* restore all saved variables and stuff */
642 LEAVE_SCOPE (0); 647 LEAVE_SCOPE (0);
… …
654 } 659 }
655 660
656 SvREFCNT_dec (GvSV (PL_defgv)); 661 SvREFCNT_dec (GvSV (PL_defgv));
657 SvREFCNT_dec (GvAV (PL_defgv)); 662 SvREFCNT_dec (GvAV (PL_defgv));
658 SvREFCNT_dec (GvSV (PL_errgv)); 663 SvREFCNT_dec (GvSV (PL_errgv));
659 SvREFCNT_dec (GvIOp(PL_defoutgv)); 664 SvREFCNT_dec (PL_defoutgv);
660 SvREFCNT_dec (PL_rs); 665 SvREFCNT_dec (PL_rs);
661 SvREFCNT_dec (GvSV (irsgv)); 666 SvREFCNT_dec (GvSV (irsgv));
667
668 SvREFCNT_dec (coro->asp_deffh);
669 //SvREFCNT_dec (coro->throw);
662 670
663 coro_destroy_stacks (aTHX); 671 coro_destroy_stacks (aTHX);
664} 672}
665 673
666static void 674static void
… …
1017 /* need to start coroutine */ 1025 /* need to start coroutine */
1018 next->flags &= ~CF_NEW; 1026 next->flags &= ~CF_NEW;
1019 /* first get rid of the old state */ 1027 /* first get rid of the old state */
1020 save_perl (aTHX_ prev); 1028 save_perl (aTHX_ prev);
1021 /* setup coroutine call */ 1029 /* setup coroutine call */
1022 setup_coro (aTHX_ next); 1030 coro_setup (aTHX_ next);
1023 } 1031 }
1024 else 1032 else
1025 { 1033 {
1026 /* coroutine already started */ 1034 /* coroutine already started */
1027 save_perl (aTHX_ prev); 1035 save_perl (aTHX_ prev);
… …
1095 croak ("FATAL: tried to destroy currently running coroutine"); 1103 croak ("FATAL: tried to destroy currently running coroutine");
1096 1104
1097 save_perl (aTHX_ &temp); 1105 save_perl (aTHX_ &temp);
1098 load_perl (aTHX_ coro); 1106 load_perl (aTHX_ coro);
1099 1107
1100 destroy_coro (aTHX_ coro); 1108 coro_destroy (aTHX_ coro);
1101 1109
1102 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1110 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1103 1111
1104 coro->mainstack = 0; 1112 coro->mainstack = 0;
1105 } 1113 }
… …
1623 1631
1624 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1625 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1626 av_async_pool = get_av ("Coro::async_pool", TRUE); 1634 av_async_pool = get_av ("Coro::async_pool", TRUE);
1627 1635
1628 coro_current = get_sv ("Coro::current", FALSE); 1636 coro_current = get_sv ("Coro::current", FALSE);
1629 SvREADONLY_on (coro_current); 1637 SvREADONLY_on (coro_current);
1630 1638
1631 coro_stash = gv_stashpv ("Coro", TRUE); 1639 coro_stash = gv_stashpv ("Coro", TRUE);
1632 1640
1633 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1705# for async_pool speedup 1713# for async_pool speedup
1706void 1714void
1707_pool_1 (SV *cb) 1715_pool_1 (SV *cb)
1708 CODE: 1716 CODE:
1709{ 1717{
1710 int i, len; 1718 struct coro *coro = SvSTATE (coro_current);
1711 HV *hv = (HV *)SvRV (coro_current); 1719 HV *hv = (HV *)SvRV (coro_current);
1712 AV *defav = GvAV (PL_defgv); 1720 AV *defav = GvAV (PL_defgv);
1713 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1714 AV *invoke_av; 1722 AV *invoke_av;
1723 int i, len;
1715 1724
1716 if (!invoke) 1725 if (!invoke)
1717 croak ("\3terminate\2\n"); 1726 croak ("\3terminate\2\n");
1727
1728 SvREFCNT_dec (coro->asp_deffh);
1729 coro->asp_deffh = SvREFCNT_inc (PL_defoutgv);
1718 1730
1719 hv_store (hv, "desc", sizeof ("desc") - 1, 1731 hv_store (hv, "desc", sizeof ("desc") - 1,
1720 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1732 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1721 1733
1722 invoke_av = (AV *)SvRV (invoke); 1734 invoke_av = (AV *)SvRV (invoke);
… …
1740{ 1752{
1741 struct coro *coro = SvSTATE (coro_current); 1753 struct coro *coro = SvSTATE (coro_current);
1742 1754
1743 sv_setsv (cb, &PL_sv_undef); 1755 sv_setsv (cb, &PL_sv_undef);
1744 1756
1757 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->asp_deffh;
1758 coro->asp_deffh = 0;
1759
1745 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1746 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1747 croak ("\3terminate\2\n"); 1762 croak ("\3terminate\2\n");
1748 1763
1749 av_clear (GvAV (PL_defgv)); 1764 av_clear (GvAV (PL_defgv));

Diff Legend

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