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.190 by root, Fri Oct 5 20:39:39 2007 UTC

… …
75/* 5.8.7 */ 75/* 5.8.7 */
76#ifndef SvRV_set 76#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 77# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 78#endif
79 79
80/* 5.8.8 */
81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0
83#endif
84
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 85#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 86# undef CORO_STACKGUARD
82#endif 87#endif
83 88
84#ifndef CORO_STACKGUARD 89#ifndef CORO_STACKGUARD
… …
132static AV *main_mainstack; /* used to differentiate between $main and others */ 137static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 138static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 139static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 140static SV *coro_mortal; /* will be freed after next transfer */
136 141
137static GV *irsgv; /* $/ */ 142static GV *irsgv; /* $/ */
143static GV *stdoutgv; /* *STDOUT */
138 144
139/* async_pool helper stuff */ 145/* async_pool helper stuff */
140static SV *sv_pool_rss; 146static SV *sv_pool_rss;
141static SV *sv_pool_size; 147static SV *sv_pool_size;
142static AV *av_async_pool; 148static AV *av_async_pool;
… …
192 198
193 /* optionally saved, might be zero */ 199 /* optionally saved, might be zero */
194 AV *defav; /* @_ */ 200 AV *defav; /* @_ */
195 SV *defsv; /* $_ */ 201 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */ 202 SV *errsv; /* $@ */
197 GV *deffh; /* default filehandle */ 203 SV *deffh; /* default filehandle */
198 SV *irssv; /* $/ */ 204 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */ 205 SV *irssv_sv; /* real $/ cache */
200 206
201#define VAR(name,type) type name; 207#define VAR(name,type) type name;
202# include "state.h" 208# include "state.h"
… …
208 /* coro process data */ 214 /* coro process data */
209 int prio; 215 int prio;
210 //SV *throw; 216 //SV *throw;
211 217
212 /* async_pool */ 218 /* async_pool */
213 GV *defoutgv; 219 SV *saved_deffh;
214 220
215 /* linked list */ 221 /* linked list */
216 struct coro *next, *prev; 222 struct coro *next, *prev;
217 HV *hv; /* the perl hash associated with this coro, if any */ 223 HV *hv; /* the perl hash associated with this coro, if any */
218}; 224};
… …
390#undef VAR 396#undef VAR
391 397
392 GvSV (PL_defgv) = c->defsv; 398 GvSV (PL_defgv) = c->defsv;
393 GvAV (PL_defgv) = c->defav; 399 GvAV (PL_defgv) = c->defav;
394 GvSV (PL_errgv) = c->errsv; 400 GvSV (PL_errgv) = c->errsv;
395 PL_defoutgv = c->deffh;
396 PL_rs = c->irssv;
397 GvSV (irsgv) = c->irssv_sv; 401 GvSV (irsgv) = c->irssv_sv;
398 402
399 { 403 {
400 dSP; 404 dSP;
401 CV *cv; 405 CV *cv;
… …
463 } 467 }
464 468
465 c->defav = GvAV (PL_defgv); 469 c->defav = GvAV (PL_defgv);
466 c->defsv = DEFSV; 470 c->defsv = DEFSV;
467 c->errsv = ERRSV; 471 c->errsv = ERRSV;
468 c->deffh = PL_defoutgv;
469 c->irssv = PL_rs;
470 c->irssv_sv = GvSV (irsgv); 472 c->irssv_sv = GvSV (irsgv);
471 473
472#define VAR(name,type)c->name = PL_ ## name; 474#define VAR(name,type)c->name = PL_ ## name;
473# include "state.h" 475# include "state.h"
474#undef VAR 476#undef VAR
… …
555} 557}
556 558
557static size_t 559static size_t
558coro_rss (pTHX_ struct coro *coro) 560coro_rss (pTHX_ struct coro *coro)
559{ 561{
560 size_t rss = sizeof (coro); 562 size_t rss = sizeof (*coro);
561 563
562 if (coro->mainstack) 564 if (coro->mainstack)
563 { 565 {
564 if (coro->flags & CF_RUNNING) 566 if (coro->flags & CF_RUNNING)
565 { 567 {
… …
567 # include "state.h" 569 # include "state.h"
568 #undef VAR 570 #undef VAR
569 } 571 }
570 572
571 rss += sizeof (coro->curstackinfo); 573 rss += sizeof (coro->curstackinfo);
572 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *); 574 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 575 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 576 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 577 rss += coro->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 578 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 579 rss += coro->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 580 rss += coro->savestack_max * sizeof (ANY);
579 581
… …
607 GvSV (PL_defgv) = NEWSV (0, 0); 609 GvSV (PL_defgv) = NEWSV (0, 0);
608 GvAV (PL_defgv) = coro->args; coro->args = 0; 610 GvAV (PL_defgv) = coro->args; coro->args = 0;
609 GvSV (PL_errgv) = NEWSV (0, 0); 611 GvSV (PL_errgv) = NEWSV (0, 0);
610 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 612 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
611 PL_rs = newSVsv (GvSV (irsgv)); 613 PL_rs = newSVsv (GvSV (irsgv));
612 614 PL_defoutgv = SvREFCNT_inc (stdoutgv);
613 {
614 IO *io = newIO ();
615 PL_defoutgv = newGVgen ("Coro");
616 GvIOp(PL_defoutgv) = io;
617 IoTYPE (io) = IoTYPE_WRONLY;
618 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
619 IoFLAGS (io) |= IOf_FLUSH;
620 }
621 615
622 { 616 {
623 dSP; 617 dSP;
624 LOGOP myop; 618 LOGOP myop;
625 619
… …
663 SvREFCNT_dec (GvSV (PL_errgv)); 657 SvREFCNT_dec (GvSV (PL_errgv));
664 SvREFCNT_dec (PL_defoutgv); 658 SvREFCNT_dec (PL_defoutgv);
665 SvREFCNT_dec (PL_rs); 659 SvREFCNT_dec (PL_rs);
666 SvREFCNT_dec (GvSV (irsgv)); 660 SvREFCNT_dec (GvSV (irsgv));
667 661
668 SvREFCNT_dec (coro->defoutgv); 662 SvREFCNT_dec (coro->saved_deffh);
669 //SvREFCNT_dec (coro->throw); 663 //SvREFCNT_dec (coro->throw);
670 664
671 coro_destroy_stacks (aTHX); 665 coro_destroy_stacks (aTHX);
672} 666}
673 667
… …
1389#ifdef USE_ITHREADS 1383#ifdef USE_ITHREADS
1390 MUTEX_INIT (&coro_mutex); 1384 MUTEX_INIT (&coro_mutex);
1391#endif 1385#endif
1392 BOOT_PAGESIZE; 1386 BOOT_PAGESIZE;
1393 1387
1394 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1388 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1389 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1395 1390
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1391 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1392
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1393 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1394 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1631 1626
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 1629 av_async_pool = get_av ("Coro::async_pool", TRUE);
1635 1630
1636 coro_current = get_sv ("Coro::current", FALSE); 1631 coro_current = get_sv ("Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 1632 SvREADONLY_on (coro_current);
1638 1633
1639 coro_stash = gv_stashpv ("Coro", TRUE); 1634 coro_stash = gv_stashpv ("Coro", TRUE);
1640 1635
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1720 AV *defav = GvAV (PL_defgv); 1715 AV *defav = GvAV (PL_defgv);
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1716 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1722 AV *invoke_av; 1717 AV *invoke_av;
1723 int i, len; 1718 int i, len;
1724 1719
1725 coro->defoutgv = SvREFCNT_inc (PL_defoutgv);
1726
1727 if (!invoke) 1720 if (!invoke)
1728 croak ("\3terminate\2\n"); 1721 croak ("\3terminate\2\n");
1722
1723 SvREFCNT_dec (coro->saved_deffh);
1724 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1729 1725
1730 hv_store (hv, "desc", sizeof ("desc") - 1, 1726 hv_store (hv, "desc", sizeof ("desc") - 1,
1731 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1727 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1732 1728
1733 invoke_av = (AV *)SvRV (invoke); 1729 invoke_av = (AV *)SvRV (invoke);
… …
1740 av_fill (defav, len - 1); 1736 av_fill (defav, len - 1);
1741 for (i = 0; i < len; ++i) 1737 for (i = 0; i < len; ++i)
1742 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 1738 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1]));
1743 } 1739 }
1744 1740
1745
1746
1747 SvREFCNT_dec (invoke); 1741 SvREFCNT_dec (invoke);
1748} 1742}
1749 1743
1750void 1744void
1751_pool_2 (SV *cb) 1745_pool_2 (SV *cb)
… …
1753{ 1747{
1754 struct coro *coro = SvSTATE (coro_current); 1748 struct coro *coro = SvSTATE (coro_current);
1755 1749
1756 sv_setsv (cb, &PL_sv_undef); 1750 sv_setsv (cb, &PL_sv_undef);
1757 1751
1758 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->defoutgv; 1752 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1753 coro->saved_deffh = 0;
1759 1754
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1755 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1756 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1762 croak ("\3terminate\2\n"); 1757 croak ("\3terminate\2\n");
1763 1758

Diff Legend

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