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.242 by root, Thu Aug 14 12:48:20 2008 UTC vs.
Revision 1.250 by root, Wed Oct 22 16:34:07 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>
… …
87# define GV_NOTQUAL 0 88# define GV_NOTQUAL 0
88#endif 89#endif
89#ifndef newSV 90#ifndef newSV
90# define newSV(l) NEWSV(0,l) 91# define newSV(l) NEWSV(0,l)
91#endif 92#endif
93#ifndef SvREFCNT_inc_NN
94# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
95#endif
92 96
93/* 5.11 */ 97/* 5.11 */
94#ifndef CxHASARGS 98#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs 99# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif 100#endif
… …
147#endif 151#endif
148 152
149/* helper storage struct for Coro::AIO */ 153/* helper storage struct for Coro::AIO */
150struct io_state 154struct io_state
151{ 155{
156 AV *res;
152 int errorno; 157 int errorno;
153 I32 laststype; 158 I32 laststype;
154 int laststatval; 159 int laststatval;
155 Stat_t statcache; 160 Stat_t statcache;
156}; 161};
162
163static double (*nvtime)(); /* so why doesn't it take void? */
157 164
158static size_t coro_stacksize = CORO_STACKSIZE; 165static size_t coro_stacksize = CORO_STACKSIZE;
159static struct CoroAPI coroapi; 166static struct CoroAPI coroapi;
160static AV *main_mainstack; /* used to differentiate between $main and others */ 167static AV *main_mainstack; /* used to differentiate between $main and others */
161static JMPENV *main_top_env; 168static JMPENV *main_top_env;
… …
321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 328 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
322#endif 329#endif
323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 330 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
324 --AvFILLp (padlist); 331 --AvFILLp (padlist);
325 332
326 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 333 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
327 av_store (newpadlist, 1, (SV *)newpad); 334 av_store (newpadlist, 1, (SV *)newpad);
328 335
329 return newpadlist; 336 return newpadlist;
330} 337}
331 338
… …
361 368
362 /* casting is fun. */ 369 /* casting is fun. */
363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 370 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
364 free_padlist (aTHX_ padlist); 371 free_padlist (aTHX_ padlist);
365 372
373 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
374
366 return 0; 375 return 0;
367} 376}
368 377
369#define CORO_MAGIC_type_cv PERL_MAGIC_ext 378#define CORO_MAGIC_type_cv PERL_MAGIC_ext
370#define CORO_MAGIC_type_state PERL_MAGIC_ext 379#define CORO_MAGIC_type_state PERL_MAGIC_ext
… …
420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 429 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 430 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
422 else 431 else
423 { 432 {
424#if CORO_PREFER_PERL_FUNCTIONS 433#if CORO_PREFER_PERL_FUNCTIONS
425 /* this is probably cleaner, but also slower? */ 434 /* this is probably cleaner? but also slower! */
435 /* in practise, it seems to be less stable */
426 CV *cp = Perl_cv_clone (cv); 436 CV *cp = Perl_cv_clone (cv);
427 CvPADLIST (cv) = CvPADLIST (cp); 437 CvPADLIST (cv) = CvPADLIST (cp);
428 CvPADLIST (cp) = 0; 438 CvPADLIST (cp) = 0;
429 SvREFCNT_dec (cp); 439 SvREFCNT_dec (cp);
430#else 440#else
… …
663 #undef VAR 673 #undef VAR
664 } 674 }
665 else 675 else
666 slot = coro->slot; 676 slot = coro->slot;
667 677
678 if (slot)
679 {
668 rss += sizeof (slot->curstackinfo); 680 rss += sizeof (slot->curstackinfo);
669 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 681 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
670 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 682 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
671 rss += slot->tmps_max * sizeof (SV *); 683 rss += slot->tmps_max * sizeof (SV *);
672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 684 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
673 rss += slot->scopestack_max * sizeof (I32); 685 rss += slot->scopestack_max * sizeof (I32);
674 rss += slot->savestack_max * sizeof (ANY); 686 rss += slot->savestack_max * sizeof (ANY);
675 687
676#if !PERL_VERSION_ATLEAST (5,10,0) 688#if !PERL_VERSION_ATLEAST (5,10,0)
677 rss += slot->retstack_max * sizeof (OP *); 689 rss += slot->retstack_max * sizeof (OP *);
678#endif 690#endif
691 }
679 } 692 }
680 693
681 return rss; 694 return rss;
682} 695}
683 696
… …
801 GvSV (PL_defgv) = newSV (0); 814 GvSV (PL_defgv) = newSV (0);
802 GvAV (PL_defgv) = coro->args; coro->args = 0; 815 GvAV (PL_defgv) = coro->args; coro->args = 0;
803 GvSV (PL_errgv) = newSV (0); 816 GvSV (PL_errgv) = newSV (0);
804 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 817 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
805 PL_rs = newSVsv (GvSV (irsgv)); 818 PL_rs = newSVsv (GvSV (irsgv));
806 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 819 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
807 820
808 { 821 {
809 dSP; 822 dSP;
810 LOGOP myop; 823 LOGOP myop;
811 824
… …
907 : cx->blk_gimme == G_SCALAR ? bot + 1 920 : cx->blk_gimme == G_SCALAR ? bot + 1
908 : bot; 921 : bot;
909 922
910 av_extend (av, top - bot); 923 av_extend (av, top - bot);
911 while (bot < top) 924 while (bot < top)
912 av_push (av, SvREFCNT_inc (*bot++)); 925 av_push (av, SvREFCNT_inc_NN (*bot++));
913 926
914 PL_runops = RUNOPS_DEFAULT; 927 PL_runops = RUNOPS_DEFAULT;
915 ENTER; 928 ENTER;
916 SAVETMPS; 929 SAVETMPS;
917 EXTEND (SP, 3); 930 EXTEND (SP, 3);
… …
1441 LOCK; 1454 LOCK;
1442 1455
1443 sv_hook = coro_nready ? 0 : coro_readyhook; 1456 sv_hook = coro_nready ? 0 : coro_readyhook;
1444 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1457 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1445 1458
1446 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1459 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1447 ++coro_nready; 1460 ++coro_nready;
1448 1461
1449 UNLOCK; 1462 UNLOCK;
1450 1463
1451 if (sv_hook) 1464 if (sv_hook)
… …
1623 else 1636 else
1624 coro->slot->runops = RUNOPS_DEFAULT; 1637 coro->slot->runops = RUNOPS_DEFAULT;
1625 } 1638 }
1626} 1639}
1627 1640
1641static int
1642coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1643{
1644 AV *padlist;
1645 AV *av = (AV *)mg->mg_obj;
1646
1647 abort ();
1648
1649 return 0;
1650}
1651
1652static MGVTBL coro_gensub_vtbl = {
1653 0, 0, 0, 0,
1654 coro_gensub_free
1655};
1656
1657/*****************************************************************************/
1658/* PerlIO::cede */
1659
1660typedef struct
1661{
1662 PerlIOBuf base;
1663 NV next, every;
1664} PerlIOCede;
1665
1666static IV
1667PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1668{
1669 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1670
1671 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1672 self->next = nvtime () + self->every;
1673
1674 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1675}
1676
1677static SV *
1678PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1679{
1680 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1681
1682 return newSVnv (self->every);
1683}
1684
1685static IV
1686PerlIOCede_flush (pTHX_ PerlIO *f)
1687{
1688 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1689 double now = nvtime ();
1690
1691 if (now >= self->next)
1692 {
1693 api_cede ();
1694 self->next = now + self->every;
1695 }
1696
1697 return PerlIOBuf_flush (aTHX_ f);
1698}
1699
1700static PerlIO_funcs PerlIO_cede =
1701{
1702 sizeof(PerlIO_funcs),
1703 "cede",
1704 sizeof(PerlIOCede),
1705 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1706 PerlIOCede_pushed,
1707 PerlIOBuf_popped,
1708 PerlIOBuf_open,
1709 PerlIOBase_binmode,
1710 PerlIOCede_getarg,
1711 PerlIOBase_fileno,
1712 PerlIOBuf_dup,
1713 PerlIOBuf_read,
1714 PerlIOBuf_unread,
1715 PerlIOBuf_write,
1716 PerlIOBuf_seek,
1717 PerlIOBuf_tell,
1718 PerlIOBuf_close,
1719 PerlIOCede_flush,
1720 PerlIOBuf_fill,
1721 PerlIOBase_eof,
1722 PerlIOBase_error,
1723 PerlIOBase_clearerr,
1724 PerlIOBase_setlinebuf,
1725 PerlIOBuf_get_base,
1726 PerlIOBuf_bufsiz,
1727 PerlIOBuf_get_ptr,
1728 PerlIOBuf_get_cnt,
1729 PerlIOBuf_set_ptrcnt,
1730};
1731
1732
1628MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1733MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1629 1734
1630PROTOTYPES: DISABLE 1735PROTOTYPES: DISABLE
1631 1736
1632BOOT: 1737BOOT:
… …
1661 main_top_env = main_top_env->je_prev; 1766 main_top_env = main_top_env->je_prev;
1662 1767
1663 coroapi.ver = CORO_API_VERSION; 1768 coroapi.ver = CORO_API_VERSION;
1664 coroapi.rev = CORO_API_REVISION; 1769 coroapi.rev = CORO_API_REVISION;
1665 coroapi.transfer = api_transfer; 1770 coroapi.transfer = api_transfer;
1771
1772 {
1773 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1774
1775 if (!svp) croak ("Time::HiRes is required");
1776 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1777
1778 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1779 }
1666 1780
1667 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1781 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1668} 1782}
1669 1783
1670SV * 1784SV *
… …
1798call (Coro::State coro, SV *coderef) 1912call (Coro::State coro, SV *coderef)
1799 ALIAS: 1913 ALIAS:
1800 eval = 1 1914 eval = 1
1801 CODE: 1915 CODE:
1802{ 1916{
1803 if (coro->mainstack) 1917 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1804 { 1918 {
1805 struct coro temp; 1919 struct coro temp;
1806 1920
1807 if (!(coro->flags & CF_RUNNING)) 1921 if (!(coro->flags & CF_RUNNING))
1808 { 1922 {
… …
1961void 2075void
1962_set_current (SV *current) 2076_set_current (SV *current)
1963 PROTOTYPE: $ 2077 PROTOTYPE: $
1964 CODE: 2078 CODE:
1965 SvREFCNT_dec (SvRV (coro_current)); 2079 SvREFCNT_dec (SvRV (coro_current));
1966 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2080 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
1967 2081
1968void 2082void
1969_set_readyhook (SV *hook) 2083_set_readyhook (SV *hook)
1970 PROTOTYPE: $ 2084 PROTOTYPE: $
1971 CODE: 2085 CODE:
… …
2031 SvREFCNT_dec (old); 2145 SvREFCNT_dec (old);
2032 croak ("\3async_pool terminate\2\n"); 2146 croak ("\3async_pool terminate\2\n");
2033 } 2147 }
2034 2148
2035 SvREFCNT_dec (coro->saved_deffh); 2149 SvREFCNT_dec (coro->saved_deffh);
2036 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2150 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2037 2151
2038 hv_store (hv, "desc", sizeof ("desc") - 1, 2152 hv_store (hv, "desc", sizeof ("desc") - 1,
2039 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2153 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2040 2154
2041 invoke_av = (AV *)SvRV (invoke); 2155 invoke_av = (AV *)SvRV (invoke);
… …
2045 2159
2046 if (len > 0) 2160 if (len > 0)
2047 { 2161 {
2048 av_fill (defav, len - 1); 2162 av_fill (defav, len - 1);
2049 for (i = 0; i < len; ++i) 2163 for (i = 0; i < len; ++i)
2050 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2164 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2051 } 2165 }
2052 2166
2053 SvREFCNT_dec (invoke); 2167 SvREFCNT_dec (invoke);
2054} 2168}
2055 2169
… …
2083 api_trace (coro_current, 0); 2197 api_trace (coro_current, 0);
2084 2198
2085 av_push (av_async_pool, newSVsv (coro_current)); 2199 av_push (av_async_pool, newSVsv (coro_current));
2086} 2200}
2087 2201
2202#if 0
2203
2204void
2205_generator_call (...)
2206 PROTOTYPE: @
2207 PPCODE:
2208 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2209 xxxx
2210 abort ();
2211
2212SV *
2213gensub (SV *sub, ...)
2214 PROTOTYPE: &;@
2215 CODE:
2216{
2217 struct coro *coro;
2218 MAGIC *mg;
2219 CV *xcv;
2220 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2221 int i;
2222
2223 CvGV (ncv) = CvGV (cv);
2224 CvFILE (ncv) = CvFILE (cv);
2225
2226 Newz (0, coro, 1, struct coro);
2227 coro->args = newAV ();
2228 coro->flags = CF_NEW;
2229
2230 av_extend (coro->args, items - 1);
2231 for (i = 1; i < items; i++)
2232 av_push (coro->args, newSVsv (ST (i)));
2233
2234 CvISXSUB_on (ncv);
2235 CvXSUBANY (ncv).any_ptr = (void *)coro;
2236
2237 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2238
2239 CvXSUB (ncv) = CvXSUB (xcv);
2240 CvANON_on (ncv);
2241
2242 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2243 RETVAL = newRV_noinc ((SV *)ncv);
2244}
2245 OUTPUT:
2246 RETVAL
2247
2248#endif
2249
2088 2250
2089MODULE = Coro::State PACKAGE = Coro::AIO 2251MODULE = Coro::State PACKAGE = Coro::AIO
2090 2252
2091SV * 2253void
2092_get_state () 2254_get_state (SV *self)
2093 CODE: 2255 PPCODE:
2094{ 2256{
2095 struct io_state *data; 2257 AV *defav = GvAV (PL_defgv);
2096 2258 AV *av = newAV ();
2259 int i;
2097 RETVAL = newSV (sizeof (struct io_state)); 2260 SV *data_sv = newSV (sizeof (struct io_state));
2098 data = (struct io_state *)SvPVX (RETVAL); 2261 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2099 SvCUR_set (RETVAL, sizeof (struct io_state)); 2262 SvCUR_set (data_sv, sizeof (struct io_state));
2100 SvPOK_only (RETVAL); 2263 SvPOK_only (data_sv);
2101 2264
2102 data->errorno = errno; 2265 data->errorno = errno;
2103 data->laststype = PL_laststype; 2266 data->laststype = PL_laststype;
2104 data->laststatval = PL_laststatval; 2267 data->laststatval = PL_laststatval;
2105 data->statcache = PL_statcache; 2268 data->statcache = PL_statcache;
2269
2270 av_extend (av, AvFILLp (defav) + 1 + 1);
2271
2272 for (i = 0; i <= AvFILLp (defav); ++i)
2273 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2274
2275 av_push (av, data_sv);
2276
2277 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2278
2279 api_ready (self);
2106} 2280}
2107 OUTPUT:
2108 RETVAL
2109 2281
2110void 2282void
2111_set_state (char *data_) 2283_set_state (SV *state)
2112 PROTOTYPE: $ 2284 PROTOTYPE: $
2113 CODE: 2285 PPCODE:
2114{ 2286{
2115 struct io_state *data = (void *)data_; 2287 AV *av = (AV *)SvRV (state);
2288 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2289 int i;
2116 2290
2117 errno = data->errorno; 2291 errno = data->errorno;
2118 PL_laststype = data->laststype; 2292 PL_laststype = data->laststype;
2119 PL_laststatval = data->laststatval; 2293 PL_laststatval = data->laststatval;
2120 PL_statcache = data->statcache; 2294 PL_statcache = data->statcache;
2295
2296 EXTEND (SP, AvFILLp (av));
2297 for (i = 0; i < AvFILLp (av); ++i)
2298 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2121} 2299}
2122 2300
2123 2301
2124MODULE = Coro::State PACKAGE = Coro::AnyEvent 2302MODULE = Coro::State PACKAGE = Coro::AnyEvent
2125 2303
… …
2149 } 2327 }
2150 2328
2151 --incede; 2329 --incede;
2152} 2330}
2153 2331
2332
2333MODULE = Coro::State PACKAGE = PerlIO::cede
2334
2335BOOT:
2336 PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

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