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.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 IO *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"
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 SV *saved_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};
… …
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 PL_defoutgv = c->deffh;
392 PL_rs = c->irssv;
393 GvSV (irsgv) = c->irssv_sv; 395 GvSV (irsgv) = c->irssv_sv;
394 396
395 { 397 {
396 dSP; 398 dSP;
397 CV *cv; 399 CV *cv;
… …
459 } 461 }
460 462
461 c->defav = GvAV (PL_defgv); 463 c->defav = GvAV (PL_defgv);
462 c->defsv = DEFSV; 464 c->defsv = DEFSV;
463 c->errsv = ERRSV; 465 c->errsv = ERRSV;
464 c->deffh = PL_defoutgv;
465 c->irssv = PL_rs;
466 c->irssv_sv = GvSV (irsgv); 466 c->irssv_sv = GvSV (irsgv);
467 467
468#define VAR(name,type)c->name = PL_ ## name; 468#define VAR(name,type)c->name = PL_ ## name;
469# include "state.h" 469# include "state.h"
470#undef VAR 470#undef VAR
… …
551} 551}
552 552
553static size_t 553static size_t
554coro_rss (pTHX_ struct coro *coro) 554coro_rss (pTHX_ struct coro *coro)
555{ 555{
556 size_t rss = sizeof (coro); 556 size_t rss = sizeof (*coro);
557 557
558 if (coro->mainstack) 558 if (coro->mainstack)
559 { 559 {
560 if (coro->flags & CF_RUNNING) 560 if (coro->flags & CF_RUNNING)
561 { 561 {
… …
658 SvREFCNT_dec (GvAV (PL_defgv)); 658 SvREFCNT_dec (GvAV (PL_defgv));
659 SvREFCNT_dec (GvSV (PL_errgv)); 659 SvREFCNT_dec (GvSV (PL_errgv));
660 SvREFCNT_dec (PL_defoutgv); 660 SvREFCNT_dec (PL_defoutgv);
661 SvREFCNT_dec (PL_rs); 661 SvREFCNT_dec (PL_rs);
662 SvREFCNT_dec (GvSV (irsgv)); 662 SvREFCNT_dec (GvSV (irsgv));
663
664 SvREFCNT_dec (coro->saved_deffh);
665 //SvREFCNT_dec (coro->throw);
663 666
664 coro_destroy_stacks (aTHX); 667 coro_destroy_stacks (aTHX);
665} 668}
666 669
667static void 670static void
… …
1624 1627
1625 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1628 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1626 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1629 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1627 av_async_pool = get_av ("Coro::async_pool", TRUE); 1630 av_async_pool = get_av ("Coro::async_pool", TRUE);
1628 1631
1629 coro_current = get_sv ("Coro::current", FALSE); 1632 coro_current = get_sv ("Coro::current", FALSE);
1630 SvREADONLY_on (coro_current); 1633 SvREADONLY_on (coro_current);
1631 1634
1632 coro_stash = gv_stashpv ("Coro", TRUE); 1635 coro_stash = gv_stashpv ("Coro", TRUE);
1633 1636
1634 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1637 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1706# for async_pool speedup 1709# for async_pool speedup
1707void 1710void
1708_pool_1 (SV *cb) 1711_pool_1 (SV *cb)
1709 CODE: 1712 CODE:
1710{ 1713{
1711 int i, len; 1714 struct coro *coro = SvSTATE (coro_current);
1712 HV *hv = (HV *)SvRV (coro_current); 1715 HV *hv = (HV *)SvRV (coro_current);
1713 AV *defav = GvAV (PL_defgv); 1716 AV *defav = GvAV (PL_defgv);
1714 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1717 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1715 AV *invoke_av; 1718 AV *invoke_av;
1719 int i, len;
1716 1720
1717 if (!invoke) 1721 if (!invoke)
1718 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);
1719 1726
1720 hv_store (hv, "desc", sizeof ("desc") - 1, 1727 hv_store (hv, "desc", sizeof ("desc") - 1,
1721 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1728 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1722 1729
1723 invoke_av = (AV *)SvRV (invoke); 1730 invoke_av = (AV *)SvRV (invoke);
… …
1741{ 1748{
1742 struct coro *coro = SvSTATE (coro_current); 1749 struct coro *coro = SvSTATE (coro_current);
1743 1750
1744 sv_setsv (cb, &PL_sv_undef); 1751 sv_setsv (cb, &PL_sv_undef);
1745 1752
1753 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1754 coro->saved_deffh = 0;
1755
1746 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1756 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1747 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1757 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1748 croak ("\3terminate\2\n"); 1758 croak ("\3terminate\2\n");
1749 1759
1750 av_clear (GvAV (PL_defgv)); 1760 av_clear (GvAV (PL_defgv));

Diff Legend

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