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.180 by root, Wed Oct 3 17:12:20 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};
… …
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 {
… …
658 SvREFCNT_dec (GvAV (PL_defgv)); 662 SvREFCNT_dec (GvAV (PL_defgv));
659 SvREFCNT_dec (GvSV (PL_errgv)); 663 SvREFCNT_dec (GvSV (PL_errgv));
660 SvREFCNT_dec (PL_defoutgv); 664 SvREFCNT_dec (PL_defoutgv);
661 SvREFCNT_dec (PL_rs); 665 SvREFCNT_dec (PL_rs);
662 SvREFCNT_dec (GvSV (irsgv)); 666 SvREFCNT_dec (GvSV (irsgv));
667
668 SvREFCNT_dec (coro->asp_deffh);
669 //SvREFCNT_dec (coro->throw);
663 670
664 coro_destroy_stacks (aTHX); 671 coro_destroy_stacks (aTHX);
665} 672}
666 673
667static void 674static void
… …
1624 1631
1625 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1626 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1627 av_async_pool = get_av ("Coro::async_pool", TRUE); 1634 av_async_pool = get_av ("Coro::async_pool", TRUE);
1628 1635
1629 coro_current = get_sv ("Coro::current", FALSE); 1636 coro_current = get_sv ("Coro::current", FALSE);
1630 SvREADONLY_on (coro_current); 1637 SvREADONLY_on (coro_current);
1631 1638
1632 coro_stash = gv_stashpv ("Coro", TRUE); 1639 coro_stash = gv_stashpv ("Coro", TRUE);
1633 1640
1634 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1706# for async_pool speedup 1713# for async_pool speedup
1707void 1714void
1708_pool_1 (SV *cb) 1715_pool_1 (SV *cb)
1709 CODE: 1716 CODE:
1710{ 1717{
1711 int i, len; 1718 struct coro *coro = SvSTATE (coro_current);
1712 HV *hv = (HV *)SvRV (coro_current); 1719 HV *hv = (HV *)SvRV (coro_current);
1713 AV *defav = GvAV (PL_defgv); 1720 AV *defav = GvAV (PL_defgv);
1714 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1715 AV *invoke_av; 1722 AV *invoke_av;
1723 int i, len;
1716 1724
1717 if (!invoke) 1725 if (!invoke)
1718 croak ("\3terminate\2\n"); 1726 croak ("\3terminate\2\n");
1727
1728 SvREFCNT_dec (coro->asp_deffh);
1729 coro->asp_deffh = SvREFCNT_inc (PL_defoutgv);
1719 1730
1720 hv_store (hv, "desc", sizeof ("desc") - 1, 1731 hv_store (hv, "desc", sizeof ("desc") - 1,
1721 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1732 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1722 1733
1723 invoke_av = (AV *)SvRV (invoke); 1734 invoke_av = (AV *)SvRV (invoke);
… …
1741{ 1752{
1742 struct coro *coro = SvSTATE (coro_current); 1753 struct coro *coro = SvSTATE (coro_current);
1743 1754
1744 sv_setsv (cb, &PL_sv_undef); 1755 sv_setsv (cb, &PL_sv_undef);
1745 1756
1757 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->asp_deffh;
1758 coro->asp_deffh = 0;
1759
1746 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1747 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1748 croak ("\3terminate\2\n"); 1762 croak ("\3terminate\2\n");
1749 1763
1750 av_clear (GvAV (PL_defgv)); 1764 av_clear (GvAV (PL_defgv));

Diff Legend

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