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.244 by root, Sun Sep 21 18:29:39 2008 UTC vs.
Revision 1.252 by root, Tue Nov 4 12:08:44 2008 UTC

4#define PERL_EXT 4#define PERL_EXT
5 5
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
9 10
10#include "patchlevel.h" 11#include "patchlevel.h"
11 12
12#include <stdio.h> 13#include <stdio.h>
13#include <errno.h> 14#include <errno.h>
80# ifndef IS_PADCONST 81# ifndef IS_PADCONST
81# define IS_PADCONST(v) 0 82# define IS_PADCONST(v) 0
82# endif 83# endif
83#endif 84#endif
84 85
86/* 5.11 */
87#ifndef CxHASARGS
88# define CxHASARGS(cx) (cx)->blk_sub.hasargs
89#endif
90
91/* 5.10.0 */
92#ifndef SvREFCNT_inc_NN
93# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
94#endif
95
85/* 5.8.8 */ 96/* 5.8.8 */
86#ifndef GV_NOTQUAL 97#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0 98# define GV_NOTQUAL 0
88#endif 99#endif
89#ifndef newSV 100#ifndef newSV
90# define newSV(l) NEWSV(0,l) 101# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif 102#endif
97 103
98/* 5.8.7 */ 104/* 5.8.7 */
99#ifndef SvRV_set 105#ifndef SvRV_set
100# define SvRV_set(s,v) SvRV(s) = (v) 106# define SvRV_set(s,v) SvRV(s) = (v)
147#endif 153#endif
148 154
149/* helper storage struct for Coro::AIO */ 155/* helper storage struct for Coro::AIO */
150struct io_state 156struct io_state
151{ 157{
158 AV *res;
152 int errorno; 159 int errorno;
153 I32 laststype; 160 I32 laststype;
154 int laststatval; 161 int laststatval;
155 Stat_t statcache; 162 Stat_t statcache;
156}; 163};
157 164
165static double (*nvtime)(); /* so why doesn't it take void? */
166
158static size_t coro_stacksize = CORO_STACKSIZE; 167static size_t coro_stacksize = CORO_STACKSIZE;
159static struct CoroAPI coroapi; 168static struct CoroAPI coroapi;
160static AV *main_mainstack; /* used to differentiate between $main and others */ 169static AV *main_mainstack; /* used to differentiate between $main and others */
161static JMPENV *main_top_env; 170static JMPENV *main_top_env;
162static HV *coro_state_stash, *coro_stash; 171static HV *coro_state_stash, *coro_stash;
163static volatile SV *coro_mortal; /* will be freed after next transfer */ 172static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
164 173
165static GV *irsgv; /* $/ */ 174static GV *irsgv; /* $/ */
166static GV *stdoutgv; /* *STDOUT */ 175static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook; 176static SV *rv_diehook;
168static SV *rv_warnhook; 177static SV *rv_warnhook;
321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 330 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
322#endif 331#endif
323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 332 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
324 --AvFILLp (padlist); 333 --AvFILLp (padlist);
325 334
326 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 335 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
327 av_store (newpadlist, 1, (SV *)newpad); 336 av_store (newpadlist, 1, (SV *)newpad);
328 337
329 return newpadlist; 338 return newpadlist;
330} 339}
331 340
361 370
362 /* casting is fun. */ 371 /* casting is fun. */
363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 372 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
364 free_padlist (aTHX_ padlist); 373 free_padlist (aTHX_ padlist);
365 374
366 SvREFCNT_dec (av); 375 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
367 376
368 return 0; 377 return 0;
369} 378}
370 379
371#define CORO_MAGIC_type_cv PERL_MAGIC_ext 380#define CORO_MAGIC_type_cv PERL_MAGIC_ext
666 #undef VAR 675 #undef VAR
667 } 676 }
668 else 677 else
669 slot = coro->slot; 678 slot = coro->slot;
670 679
680 if (slot)
681 {
671 rss += sizeof (slot->curstackinfo); 682 rss += sizeof (slot->curstackinfo);
672 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 683 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
673 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 684 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
674 rss += slot->tmps_max * sizeof (SV *); 685 rss += slot->tmps_max * sizeof (SV *);
675 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 686 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
676 rss += slot->scopestack_max * sizeof (I32); 687 rss += slot->scopestack_max * sizeof (I32);
677 rss += slot->savestack_max * sizeof (ANY); 688 rss += slot->savestack_max * sizeof (ANY);
678 689
679#if !PERL_VERSION_ATLEAST (5,10,0) 690#if !PERL_VERSION_ATLEAST (5,10,0)
680 rss += slot->retstack_max * sizeof (OP *); 691 rss += slot->retstack_max * sizeof (OP *);
681#endif 692#endif
693 }
682 } 694 }
683 695
684 return rss; 696 return rss;
685} 697}
686 698
804 GvSV (PL_defgv) = newSV (0); 816 GvSV (PL_defgv) = newSV (0);
805 GvAV (PL_defgv) = coro->args; coro->args = 0; 817 GvAV (PL_defgv) = coro->args; coro->args = 0;
806 GvSV (PL_errgv) = newSV (0); 818 GvSV (PL_errgv) = newSV (0);
807 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 819 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
808 PL_rs = newSVsv (GvSV (irsgv)); 820 PL_rs = newSVsv (GvSV (irsgv));
809 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 821 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
810 822
811 { 823 {
812 dSP; 824 dSP;
813 LOGOP myop; 825 LOGOP myop;
814 826
910 : cx->blk_gimme == G_SCALAR ? bot + 1 922 : cx->blk_gimme == G_SCALAR ? bot + 1
911 : bot; 923 : bot;
912 924
913 av_extend (av, top - bot); 925 av_extend (av, top - bot);
914 while (bot < top) 926 while (bot < top)
915 av_push (av, SvREFCNT_inc (*bot++)); 927 av_push (av, SvREFCNT_inc_NN (*bot++));
916 928
917 PL_runops = RUNOPS_DEFAULT; 929 PL_runops = RUNOPS_DEFAULT;
918 ENTER; 930 ENTER;
919 SAVETMPS; 931 SAVETMPS;
920 EXTEND (SP, 3); 932 EXTEND (SP, 3);
1196/* always use the TRANSFER macro */ 1208/* always use the TRANSFER macro */
1197static void NOINLINE 1209static void NOINLINE
1198transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1210transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1199{ 1211{
1200 dSTACKLEVEL; 1212 dSTACKLEVEL;
1201 static volatile int has_throw;
1202 1213
1203 /* sometimes transfer is only called to set idle_sp */ 1214 /* sometimes transfer is only called to set idle_sp */
1204 if (expect_false (!next)) 1215 if (expect_false (!next))
1205 { 1216 {
1206 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1217 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1207 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1218 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1208 } 1219 }
1209 else if (expect_true (prev != next)) 1220 else if (expect_true (prev != next))
1210 { 1221 {
1222 static volatile int has_throw;
1211 coro_cctx *prev__cctx; 1223 coro_cctx *prev__cctx;
1212 1224
1213 if (expect_false (prev->flags & CF_NEW)) 1225 if (expect_false (prev->flags & CF_NEW))
1214 { 1226 {
1215 /* create a new empty context */ 1227 /* create a new empty context */
1444 LOCK; 1456 LOCK;
1445 1457
1446 sv_hook = coro_nready ? 0 : coro_readyhook; 1458 sv_hook = coro_nready ? 0 : coro_readyhook;
1447 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1459 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1448 1460
1449 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1461 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1450 ++coro_nready; 1462 ++coro_nready;
1451 1463
1452 UNLOCK; 1464 UNLOCK;
1453 1465
1454 if (sv_hook) 1466 if (sv_hook)
1642static MGVTBL coro_gensub_vtbl = { 1654static MGVTBL coro_gensub_vtbl = {
1643 0, 0, 0, 0, 1655 0, 0, 0, 0,
1644 coro_gensub_free 1656 coro_gensub_free
1645}; 1657};
1646 1658
1659/*****************************************************************************/
1660/* PerlIO::cede */
1661
1662typedef struct
1663{
1664 PerlIOBuf base;
1665 NV next, every;
1666} PerlIOCede;
1667
1668static IV
1669PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1670{
1671 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1672
1673 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1674 self->next = nvtime () + self->every;
1675
1676 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1677}
1678
1679static SV *
1680PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1681{
1682 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1683
1684 return newSVnv (self->every);
1685}
1686
1687static IV
1688PerlIOCede_flush (pTHX_ PerlIO *f)
1689{
1690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1691 double now = nvtime ();
1692
1693 if (now >= self->next)
1694 {
1695 api_cede ();
1696 self->next = now + self->every;
1697 }
1698
1699 return PerlIOBuf_flush (aTHX_ f);
1700}
1701
1702static PerlIO_funcs PerlIO_cede =
1703{
1704 sizeof(PerlIO_funcs),
1705 "cede",
1706 sizeof(PerlIOCede),
1707 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1708 PerlIOCede_pushed,
1709 PerlIOBuf_popped,
1710 PerlIOBuf_open,
1711 PerlIOBase_binmode,
1712 PerlIOCede_getarg,
1713 PerlIOBase_fileno,
1714 PerlIOBuf_dup,
1715 PerlIOBuf_read,
1716 PerlIOBuf_unread,
1717 PerlIOBuf_write,
1718 PerlIOBuf_seek,
1719 PerlIOBuf_tell,
1720 PerlIOBuf_close,
1721 PerlIOCede_flush,
1722 PerlIOBuf_fill,
1723 PerlIOBase_eof,
1724 PerlIOBase_error,
1725 PerlIOBase_clearerr,
1726 PerlIOBase_setlinebuf,
1727 PerlIOBuf_get_base,
1728 PerlIOBuf_bufsiz,
1729 PerlIOBuf_get_ptr,
1730 PerlIOBuf_get_cnt,
1731 PerlIOBuf_set_ptrcnt,
1732};
1733
1734
1647MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1735MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1648 1736
1649PROTOTYPES: DISABLE 1737PROTOTYPES: DISABLE
1650 1738
1651BOOT: 1739BOOT:
1680 main_top_env = main_top_env->je_prev; 1768 main_top_env = main_top_env->je_prev;
1681 1769
1682 coroapi.ver = CORO_API_VERSION; 1770 coroapi.ver = CORO_API_VERSION;
1683 coroapi.rev = CORO_API_REVISION; 1771 coroapi.rev = CORO_API_REVISION;
1684 coroapi.transfer = api_transfer; 1772 coroapi.transfer = api_transfer;
1773
1774 {
1775 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1776
1777 if (!svp) croak ("Time::HiRes is required");
1778 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1779
1780 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1781 }
1685 1782
1686 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1783 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1687} 1784}
1688 1785
1689SV * 1786SV *
1737 ta.next = 0; 1834 ta.next = 0;
1738 break; 1835 break;
1739 1836
1740 case 1: 1837 case 1:
1741 if (items != 2) 1838 if (items != 2)
1742 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1839 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1743 1840
1744 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1841 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1745 break; 1842 break;
1746 1843
1747 case 2: 1844 case 2:
1817call (Coro::State coro, SV *coderef) 1914call (Coro::State coro, SV *coderef)
1818 ALIAS: 1915 ALIAS:
1819 eval = 1 1916 eval = 1
1820 CODE: 1917 CODE:
1821{ 1918{
1822 if (coro->mainstack) 1919 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1823 { 1920 {
1824 struct coro temp; 1921 struct coro temp;
1825 1922
1826 if (!(coro->flags & CF_RUNNING)) 1923 if (!(coro->flags & CF_RUNNING))
1827 { 1924 {
1910 CODE: 2007 CODE:
1911 struct coro *coro = SvSTATE (coro_current); 2008 struct coro *coro = SvSTATE (coro_current);
1912 coro->cctx->idle_sp = 0; 2009 coro->cctx->idle_sp = 0;
1913 2010
1914void 2011void
1915throw (Coro::State self, SV *throw = &PL_sv_undef)
1916 PROTOTYPE: $;$
1917 CODE:
1918 SvREFCNT_dec (self->throw);
1919 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1920
1921void
1922swap_defsv (Coro::State self) 2012swap_defsv (Coro::State self)
1923 PROTOTYPE: $ 2013 PROTOTYPE: $
1924 ALIAS: 2014 ALIAS:
1925 swap_defav = 1 2015 swap_defav = 1
1926 CODE: 2016 CODE:
1980void 2070void
1981_set_current (SV *current) 2071_set_current (SV *current)
1982 PROTOTYPE: $ 2072 PROTOTYPE: $
1983 CODE: 2073 CODE:
1984 SvREFCNT_dec (SvRV (coro_current)); 2074 SvREFCNT_dec (SvRV (coro_current));
1985 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2075 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
1986 2076
1987void 2077void
1988_set_readyhook (SV *hook) 2078_set_readyhook (SV *hook)
1989 PROTOTYPE: $ 2079 PROTOTYPE: $
1990 CODE: 2080 CODE:
2029 CODE: 2119 CODE:
2030 RETVAL = coro_nready; 2120 RETVAL = coro_nready;
2031 OUTPUT: 2121 OUTPUT:
2032 RETVAL 2122 RETVAL
2033 2123
2124void
2125throw (Coro::State self, SV *throw = &PL_sv_undef)
2126 PROTOTYPE: $;$
2127 CODE:
2128 SvREFCNT_dec (self->throw);
2129 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2130
2034# for async_pool speedup 2131# for async_pool speedup
2035void 2132void
2036_pool_1 (SV *cb) 2133_pool_1 (SV *cb)
2037 CODE: 2134 CODE:
2038{ 2135{
2050 SvREFCNT_dec (old); 2147 SvREFCNT_dec (old);
2051 croak ("\3async_pool terminate\2\n"); 2148 croak ("\3async_pool terminate\2\n");
2052 } 2149 }
2053 2150
2054 SvREFCNT_dec (coro->saved_deffh); 2151 SvREFCNT_dec (coro->saved_deffh);
2055 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2152 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2056 2153
2057 hv_store (hv, "desc", sizeof ("desc") - 1, 2154 hv_store (hv, "desc", sizeof ("desc") - 1,
2058 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2155 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2059 2156
2060 invoke_av = (AV *)SvRV (invoke); 2157 invoke_av = (AV *)SvRV (invoke);
2064 2161
2065 if (len > 0) 2162 if (len > 0)
2066 { 2163 {
2067 av_fill (defav, len - 1); 2164 av_fill (defav, len - 1);
2068 for (i = 0; i < len; ++i) 2165 for (i = 0; i < len; ++i)
2069 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2166 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2070 } 2167 }
2071 2168
2072 SvREFCNT_dec (invoke); 2169 SvREFCNT_dec (invoke);
2073} 2170}
2074 2171
2153#endif 2250#endif
2154 2251
2155 2252
2156MODULE = Coro::State PACKAGE = Coro::AIO 2253MODULE = Coro::State PACKAGE = Coro::AIO
2157 2254
2158SV * 2255void
2159_get_state () 2256_get_state (SV *self)
2160 CODE: 2257 PPCODE:
2161{ 2258{
2162 struct io_state *data; 2259 AV *defav = GvAV (PL_defgv);
2163 2260 AV *av = newAV ();
2261 int i;
2164 RETVAL = newSV (sizeof (struct io_state)); 2262 SV *data_sv = newSV (sizeof (struct io_state));
2165 data = (struct io_state *)SvPVX (RETVAL); 2263 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2166 SvCUR_set (RETVAL, sizeof (struct io_state)); 2264 SvCUR_set (data_sv, sizeof (struct io_state));
2167 SvPOK_only (RETVAL); 2265 SvPOK_only (data_sv);
2168 2266
2169 data->errorno = errno; 2267 data->errorno = errno;
2170 data->laststype = PL_laststype; 2268 data->laststype = PL_laststype;
2171 data->laststatval = PL_laststatval; 2269 data->laststatval = PL_laststatval;
2172 data->statcache = PL_statcache; 2270 data->statcache = PL_statcache;
2271
2272 av_extend (av, AvFILLp (defav) + 1 + 1);
2273
2274 for (i = 0; i <= AvFILLp (defav); ++i)
2275 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2276
2277 av_push (av, data_sv);
2278
2279 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2280
2281 api_ready (self);
2173} 2282}
2174 OUTPUT:
2175 RETVAL
2176 2283
2177void 2284void
2178_set_state (char *data_) 2285_set_state (SV *state)
2179 PROTOTYPE: $ 2286 PROTOTYPE: $
2180 CODE: 2287 PPCODE:
2181{ 2288{
2182 struct io_state *data = (void *)data_; 2289 AV *av = (AV *)SvRV (state);
2290 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2291 int i;
2183 2292
2184 errno = data->errorno; 2293 errno = data->errorno;
2185 PL_laststype = data->laststype; 2294 PL_laststype = data->laststype;
2186 PL_laststatval = data->laststatval; 2295 PL_laststatval = data->laststatval;
2187 PL_statcache = data->statcache; 2296 PL_statcache = data->statcache;
2297
2298 EXTEND (SP, AvFILLp (av));
2299 for (i = 0; i < AvFILLp (av); ++i)
2300 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2188} 2301}
2189 2302
2190 2303
2191MODULE = Coro::State PACKAGE = Coro::AnyEvent 2304MODULE = Coro::State PACKAGE = Coro::AnyEvent
2192 2305
2216 } 2329 }
2217 2330
2218 --incede; 2331 --incede;
2219} 2332}
2220 2333
2334
2335MODULE = Coro::State PACKAGE = PerlIO::cede
2336
2337BOOT:
2338 PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines