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.181 by root, Wed Oct 3 17:37:33 2007 UTC vs.
Revision 1.184 by root, Thu Oct 4 13:45:56 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 GV *deffh; /* default filehandle */ 197 SV *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"
… …
208 /* coro process data */ 208 /* coro process data */
209 int prio; 209 int prio;
210 //SV *throw; 210 //SV *throw;
211 211
212 /* async_pool */ 212 /* async_pool */
213 GV *defoutgv; 213 SV *saved_deffh;
214 214
215 /* linked list */ 215 /* linked list */
216 struct coro *next, *prev; 216 struct coro *next, *prev;
217 HV *hv; /* the perl hash associated with this coro, if any */ 217 HV *hv; /* the perl hash associated with this coro, if any */
218}; 218};
… …
390#undef VAR 390#undef VAR
391 391
392 GvSV (PL_defgv) = c->defsv; 392 GvSV (PL_defgv) = c->defsv;
393 GvAV (PL_defgv) = c->defav; 393 GvAV (PL_defgv) = c->defav;
394 GvSV (PL_errgv) = c->errsv; 394 GvSV (PL_errgv) = c->errsv;
395 PL_defoutgv = c->deffh;
396 PL_rs = c->irssv;
397 GvSV (irsgv) = c->irssv_sv; 395 GvSV (irsgv) = c->irssv_sv;
398 396
399 { 397 {
400 dSP; 398 dSP;
401 CV *cv; 399 CV *cv;
… …
463 } 461 }
464 462
465 c->defav = GvAV (PL_defgv); 463 c->defav = GvAV (PL_defgv);
466 c->defsv = DEFSV; 464 c->defsv = DEFSV;
467 c->errsv = ERRSV; 465 c->errsv = ERRSV;
468 c->deffh = PL_defoutgv;
469 c->irssv = PL_rs;
470 c->irssv_sv = GvSV (irsgv); 466 c->irssv_sv = GvSV (irsgv);
471 467
472#define VAR(name,type)c->name = PL_ ## name; 468#define VAR(name,type)c->name = PL_ ## name;
473# include "state.h" 469# include "state.h"
474#undef VAR 470#undef VAR
… …
555} 551}
556 552
557static size_t 553static size_t
558coro_rss (pTHX_ struct coro *coro) 554coro_rss (pTHX_ struct coro *coro)
559{ 555{
560 size_t rss = sizeof (coro); 556 size_t rss = sizeof (*coro);
561 557
562 if (coro->mainstack) 558 if (coro->mainstack)
563 { 559 {
564 if (coro->flags & CF_RUNNING) 560 if (coro->flags & CF_RUNNING)
565 { 561 {
… …
663 SvREFCNT_dec (GvSV (PL_errgv)); 659 SvREFCNT_dec (GvSV (PL_errgv));
664 SvREFCNT_dec (PL_defoutgv); 660 SvREFCNT_dec (PL_defoutgv);
665 SvREFCNT_dec (PL_rs); 661 SvREFCNT_dec (PL_rs);
666 SvREFCNT_dec (GvSV (irsgv)); 662 SvREFCNT_dec (GvSV (irsgv));
667 663
668 SvREFCNT_dec (coro->defoutgv); 664 SvREFCNT_dec (coro->saved_deffh);
669 //SvREFCNT_dec (coro->throw); 665 //SvREFCNT_dec (coro->throw);
670 666
671 coro_destroy_stacks (aTHX); 667 coro_destroy_stacks (aTHX);
672} 668}
673 669
… …
1631 1627
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1628 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1629 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 1630 av_async_pool = get_av ("Coro::async_pool", TRUE);
1635 1631
1636 coro_current = get_sv ("Coro::current", FALSE); 1632 coro_current = get_sv ("Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 1633 SvREADONLY_on (coro_current);
1638 1634
1639 coro_stash = gv_stashpv ("Coro", TRUE); 1635 coro_stash = gv_stashpv ("Coro", TRUE);
1640 1636
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1637 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1720 AV *defav = GvAV (PL_defgv); 1716 AV *defav = GvAV (PL_defgv);
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1717 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1722 AV *invoke_av; 1718 AV *invoke_av;
1723 int i, len; 1719 int i, len;
1724 1720
1725 coro->defoutgv = SvREFCNT_inc (PL_defoutgv);
1726
1727 if (!invoke) 1721 if (!invoke)
1728 croak ("\3terminate\2\n"); 1722 croak ("\3terminate\2\n");
1723
1724 SvREFCNT_dec (coro->saved_deffh);
1725 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1729 1726
1730 hv_store (hv, "desc", sizeof ("desc") - 1, 1727 hv_store (hv, "desc", sizeof ("desc") - 1,
1731 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1728 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1732 1729
1733 invoke_av = (AV *)SvRV (invoke); 1730 invoke_av = (AV *)SvRV (invoke);
… …
1740 av_fill (defav, len - 1); 1737 av_fill (defav, len - 1);
1741 for (i = 0; i < len; ++i) 1738 for (i = 0; i < len; ++i)
1742 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 1739 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1]));
1743 } 1740 }
1744 1741
1745
1746
1747 SvREFCNT_dec (invoke); 1742 SvREFCNT_dec (invoke);
1748} 1743}
1749 1744
1750void 1745void
1751_pool_2 (SV *cb) 1746_pool_2 (SV *cb)
… …
1753{ 1748{
1754 struct coro *coro = SvSTATE (coro_current); 1749 struct coro *coro = SvSTATE (coro_current);
1755 1750
1756 sv_setsv (cb, &PL_sv_undef); 1751 sv_setsv (cb, &PL_sv_undef);
1757 1752
1758 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->defoutgv; 1753 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1754 coro->saved_deffh = 0;
1759 1755
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1756 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1757 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1762 croak ("\3terminate\2\n"); 1758 croak ("\3terminate\2\n");
1763 1759

Diff Legend

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