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.248 by root, Mon Sep 29 12:40:50 2008 UTC vs.
Revision 1.252 by root, Tue Nov 4 12:08:44 2008 UTC

… …
81# ifndef IS_PADCONST 81# ifndef IS_PADCONST
82# define IS_PADCONST(v) 0 82# define IS_PADCONST(v) 0
83# endif 83# endif
84#endif 84#endif
85 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
86/* 5.8.8 */ 96/* 5.8.8 */
87#ifndef GV_NOTQUAL 97#ifndef GV_NOTQUAL
88# define GV_NOTQUAL 0 98# define GV_NOTQUAL 0
89#endif 99#endif
90#ifndef newSV 100#ifndef newSV
91# define newSV(l) NEWSV(0,l) 101# define newSV(l) NEWSV(0,l)
92#endif
93
94/* 5.11 */
95#ifndef CxHASARGS
96# define CxHASARGS(cx) (cx)->blk_sub.hasargs
97#endif 102#endif
98 103
99/* 5.8.7 */ 104/* 5.8.7 */
100#ifndef SvRV_set 105#ifndef SvRV_set
101# define SvRV_set(s,v) SvRV(s) = (v) 106# define SvRV_set(s,v) SvRV(s) = (v)
… …
148#endif 153#endif
149 154
150/* helper storage struct for Coro::AIO */ 155/* helper storage struct for Coro::AIO */
151struct io_state 156struct io_state
152{ 157{
158 AV *res;
153 int errorno; 159 int errorno;
154 I32 laststype; 160 I32 laststype;
155 int laststatval; 161 int laststatval;
156 Stat_t statcache; 162 Stat_t statcache;
157}; 163};
… …
161static size_t coro_stacksize = CORO_STACKSIZE; 167static size_t coro_stacksize = CORO_STACKSIZE;
162static struct CoroAPI coroapi; 168static struct CoroAPI coroapi;
163static AV *main_mainstack; /* used to differentiate between $main and others */ 169static AV *main_mainstack; /* used to differentiate between $main and others */
164static JMPENV *main_top_env; 170static JMPENV *main_top_env;
165static HV *coro_state_stash, *coro_stash; 171static HV *coro_state_stash, *coro_stash;
166static volatile SV *coro_mortal; /* will be freed after next transfer */ 172static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
167 173
168static GV *irsgv; /* $/ */ 174static GV *irsgv; /* $/ */
169static GV *stdoutgv; /* *STDOUT */ 175static GV *stdoutgv; /* *STDOUT */
170static SV *rv_diehook; 176static SV *rv_diehook;
171static SV *rv_warnhook; 177static SV *rv_warnhook;
… …
324 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 330 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
325#endif 331#endif
326 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 332 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
327 --AvFILLp (padlist); 333 --AvFILLp (padlist);
328 334
329 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 335 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
330 av_store (newpadlist, 1, (SV *)newpad); 336 av_store (newpadlist, 1, (SV *)newpad);
331 337
332 return newpadlist; 338 return newpadlist;
333} 339}
334 340
… …
810 GvSV (PL_defgv) = newSV (0); 816 GvSV (PL_defgv) = newSV (0);
811 GvAV (PL_defgv) = coro->args; coro->args = 0; 817 GvAV (PL_defgv) = coro->args; coro->args = 0;
812 GvSV (PL_errgv) = newSV (0); 818 GvSV (PL_errgv) = newSV (0);
813 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);
814 PL_rs = newSVsv (GvSV (irsgv)); 820 PL_rs = newSVsv (GvSV (irsgv));
815 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 821 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
816 822
817 { 823 {
818 dSP; 824 dSP;
819 LOGOP myop; 825 LOGOP myop;
820 826
… …
916 : cx->blk_gimme == G_SCALAR ? bot + 1 922 : cx->blk_gimme == G_SCALAR ? bot + 1
917 : bot; 923 : bot;
918 924
919 av_extend (av, top - bot); 925 av_extend (av, top - bot);
920 while (bot < top) 926 while (bot < top)
921 av_push (av, SvREFCNT_inc (*bot++)); 927 av_push (av, SvREFCNT_inc_NN (*bot++));
922 928
923 PL_runops = RUNOPS_DEFAULT; 929 PL_runops = RUNOPS_DEFAULT;
924 ENTER; 930 ENTER;
925 SAVETMPS; 931 SAVETMPS;
926 EXTEND (SP, 3); 932 EXTEND (SP, 3);
… …
1202/* always use the TRANSFER macro */ 1208/* always use the TRANSFER macro */
1203static void NOINLINE 1209static void NOINLINE
1204transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1210transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1205{ 1211{
1206 dSTACKLEVEL; 1212 dSTACKLEVEL;
1207 static volatile int has_throw;
1208 1213
1209 /* sometimes transfer is only called to set idle_sp */ 1214 /* sometimes transfer is only called to set idle_sp */
1210 if (expect_false (!next)) 1215 if (expect_false (!next))
1211 { 1216 {
1212 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1217 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1213 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 */
1214 } 1219 }
1215 else if (expect_true (prev != next)) 1220 else if (expect_true (prev != next))
1216 { 1221 {
1222 static volatile int has_throw;
1217 coro_cctx *prev__cctx; 1223 coro_cctx *prev__cctx;
1218 1224
1219 if (expect_false (prev->flags & CF_NEW)) 1225 if (expect_false (prev->flags & CF_NEW))
1220 { 1226 {
1221 /* create a new empty context */ 1227 /* create a new empty context */
… …
1450 LOCK; 1456 LOCK;
1451 1457
1452 sv_hook = coro_nready ? 0 : coro_readyhook; 1458 sv_hook = coro_nready ? 0 : coro_readyhook;
1453 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1459 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1454 1460
1455 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1461 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1456 ++coro_nready; 1462 ++coro_nready;
1457 1463
1458 UNLOCK; 1464 UNLOCK;
1459 1465
1460 if (sv_hook) 1466 if (sv_hook)
… …
1828 ta.next = 0; 1834 ta.next = 0;
1829 break; 1835 break;
1830 1836
1831 case 1: 1837 case 1:
1832 if (items != 2) 1838 if (items != 2)
1833 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);
1834 1840
1835 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1841 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1836 break; 1842 break;
1837 1843
1838 case 2: 1844 case 2:
… …
2001 CODE: 2007 CODE:
2002 struct coro *coro = SvSTATE (coro_current); 2008 struct coro *coro = SvSTATE (coro_current);
2003 coro->cctx->idle_sp = 0; 2009 coro->cctx->idle_sp = 0;
2004 2010
2005void 2011void
2006throw (Coro::State self, SV *throw = &PL_sv_undef)
2007 PROTOTYPE: $;$
2008 CODE:
2009 SvREFCNT_dec (self->throw);
2010 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2011
2012void
2013swap_defsv (Coro::State self) 2012swap_defsv (Coro::State self)
2014 PROTOTYPE: $ 2013 PROTOTYPE: $
2015 ALIAS: 2014 ALIAS:
2016 swap_defav = 1 2015 swap_defav = 1
2017 CODE: 2016 CODE:
… …
2071void 2070void
2072_set_current (SV *current) 2071_set_current (SV *current)
2073 PROTOTYPE: $ 2072 PROTOTYPE: $
2074 CODE: 2073 CODE:
2075 SvREFCNT_dec (SvRV (coro_current)); 2074 SvREFCNT_dec (SvRV (coro_current));
2076 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2075 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2077 2076
2078void 2077void
2079_set_readyhook (SV *hook) 2078_set_readyhook (SV *hook)
2080 PROTOTYPE: $ 2079 PROTOTYPE: $
2081 CODE: 2080 CODE:
… …
2120 CODE: 2119 CODE:
2121 RETVAL = coro_nready; 2120 RETVAL = coro_nready;
2122 OUTPUT: 2121 OUTPUT:
2123 RETVAL 2122 RETVAL
2124 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
2125# for async_pool speedup 2131# for async_pool speedup
2126void 2132void
2127_pool_1 (SV *cb) 2133_pool_1 (SV *cb)
2128 CODE: 2134 CODE:
2129{ 2135{
… …
2141 SvREFCNT_dec (old); 2147 SvREFCNT_dec (old);
2142 croak ("\3async_pool terminate\2\n"); 2148 croak ("\3async_pool terminate\2\n");
2143 } 2149 }
2144 2150
2145 SvREFCNT_dec (coro->saved_deffh); 2151 SvREFCNT_dec (coro->saved_deffh);
2146 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2152 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2147 2153
2148 hv_store (hv, "desc", sizeof ("desc") - 1, 2154 hv_store (hv, "desc", sizeof ("desc") - 1,
2149 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2155 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2150 2156
2151 invoke_av = (AV *)SvRV (invoke); 2157 invoke_av = (AV *)SvRV (invoke);
… …
2155 2161
2156 if (len > 0) 2162 if (len > 0)
2157 { 2163 {
2158 av_fill (defav, len - 1); 2164 av_fill (defav, len - 1);
2159 for (i = 0; i < len; ++i) 2165 for (i = 0; i < len; ++i)
2160 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2166 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2161 } 2167 }
2162 2168
2163 SvREFCNT_dec (invoke); 2169 SvREFCNT_dec (invoke);
2164} 2170}
2165 2171
… …
2244#endif 2250#endif
2245 2251
2246 2252
2247MODULE = Coro::State PACKAGE = Coro::AIO 2253MODULE = Coro::State PACKAGE = Coro::AIO
2248 2254
2249SV * 2255void
2250_get_state () 2256_get_state (SV *self)
2251 CODE: 2257 PPCODE:
2252{ 2258{
2253 struct io_state *data; 2259 AV *defav = GvAV (PL_defgv);
2254 2260 AV *av = newAV ();
2261 int i;
2255 RETVAL = newSV (sizeof (struct io_state)); 2262 SV *data_sv = newSV (sizeof (struct io_state));
2256 data = (struct io_state *)SvPVX (RETVAL); 2263 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2257 SvCUR_set (RETVAL, sizeof (struct io_state)); 2264 SvCUR_set (data_sv, sizeof (struct io_state));
2258 SvPOK_only (RETVAL); 2265 SvPOK_only (data_sv);
2259 2266
2260 data->errorno = errno; 2267 data->errorno = errno;
2261 data->laststype = PL_laststype; 2268 data->laststype = PL_laststype;
2262 data->laststatval = PL_laststatval; 2269 data->laststatval = PL_laststatval;
2263 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);
2264} 2282}
2265 OUTPUT:
2266 RETVAL
2267 2283
2268void 2284void
2269_set_state (char *data_) 2285_set_state (SV *state)
2270 PROTOTYPE: $ 2286 PROTOTYPE: $
2271 CODE: 2287 PPCODE:
2272{ 2288{
2273 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;
2274 2292
2275 errno = data->errorno; 2293 errno = data->errorno;
2276 PL_laststype = data->laststype; 2294 PL_laststype = data->laststype;
2277 PL_laststatval = data->laststatval; 2295 PL_laststatval = data->laststatval;
2278 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])));
2279} 2301}
2280 2302
2281 2303
2282MODULE = Coro::State PACKAGE = Coro::AnyEvent 2304MODULE = Coro::State PACKAGE = Coro::AnyEvent
2283 2305

Diff Legend

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