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.183 by root, Wed Oct 3 19:19:06 2007 UTC vs.
Revision 1.186 by root, Fri Oct 5 20:10:42 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 *asp_deffh; 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
… …
567 # include "state.h" 563 # include "state.h"
568 #undef VAR 564 #undef VAR
569 } 565 }
570 566
571 rss += sizeof (coro->curstackinfo); 567 rss += sizeof (coro->curstackinfo);
572 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 *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 570 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 571 rss += coro->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 573 rss += coro->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 574 rss += coro->savestack_max * sizeof (ANY);
579 575
… …
610 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 606 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
611 PL_rs = newSVsv (GvSV (irsgv)); 607 PL_rs = newSVsv (GvSV (irsgv));
612 608
613 { 609 {
614 IO *io = newIO (); 610 IO *io = newIO ();
615 PL_defoutgv = newGVgen ("Coro"); 611 PL_defoutgv = (GV *)NEWSV (0, 0);
616 GvIOp(PL_defoutgv) = io; 612 gv_init (PL_defoutgv, coro_state_stash, "stdout", sizeof ("stdout") - 1, 0);
617 IoTYPE (io) = IoTYPE_WRONLY; 613 IoTYPE (io) = IoTYPE_WRONLY;
618 IoOFP (io) = IoIFP (io) = PerlIO_stdout (); 614 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
619 IoFLAGS (io) |= IOf_FLUSH; 615 IoFLAGS (io) |= IOf_FLUSH;
616 GvIOp (PL_defoutgv) = io;
620 } 617 }
621 618
622 { 619 {
623 dSP; 620 dSP;
624 LOGOP myop; 621 LOGOP myop;
… …
663 SvREFCNT_dec (GvSV (PL_errgv)); 660 SvREFCNT_dec (GvSV (PL_errgv));
664 SvREFCNT_dec (PL_defoutgv); 661 SvREFCNT_dec (PL_defoutgv);
665 SvREFCNT_dec (PL_rs); 662 SvREFCNT_dec (PL_rs);
666 SvREFCNT_dec (GvSV (irsgv)); 663 SvREFCNT_dec (GvSV (irsgv));
667 664
668 SvREFCNT_dec (coro->asp_deffh); 665 SvREFCNT_dec (coro->saved_deffh);
669 //SvREFCNT_dec (coro->throw); 666 //SvREFCNT_dec (coro->throw);
670 667
671 coro_destroy_stacks (aTHX); 668 coro_destroy_stacks (aTHX);
672} 669}
673 670
… …
1723 int i, len; 1720 int i, len;
1724 1721
1725 if (!invoke) 1722 if (!invoke)
1726 croak ("\3terminate\2\n"); 1723 croak ("\3terminate\2\n");
1727 1724
1728 SvREFCNT_dec (coro->asp_deffh); 1725 SvREFCNT_dec (coro->saved_deffh);
1729 coro->asp_deffh = SvREFCNT_inc (PL_defoutgv); 1726 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1730 1727
1731 hv_store (hv, "desc", sizeof ("desc") - 1, 1728 hv_store (hv, "desc", sizeof ("desc") - 1,
1732 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1729 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1733 1730
1734 invoke_av = (AV *)SvRV (invoke); 1731 invoke_av = (AV *)SvRV (invoke);
… …
1752{ 1749{
1753 struct coro *coro = SvSTATE (coro_current); 1750 struct coro *coro = SvSTATE (coro_current);
1754 1751
1755 sv_setsv (cb, &PL_sv_undef); 1752 sv_setsv (cb, &PL_sv_undef);
1756 1753
1757 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->asp_deffh; 1754 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1758 coro->asp_deffh = 0; 1755 coro->saved_deffh = 0;
1759 1756
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1757 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1758 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1762 croak ("\3terminate\2\n"); 1759 croak ("\3terminate\2\n");
1763 1760

Diff Legend

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