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.27 by root, Mon Aug 20 16:58:19 2001 UTC vs.
Revision 1.78 by root, Wed Nov 1 01:21:21 2006 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
4
1#include "EXTERN.h" 5#include "EXTERN.h"
2#include "perl.h" 6#include "perl.h"
3#include "XSUB.h" 7#include "XSUB.h"
4 8
5#include "libcoro/coro.c" 9#include "patchlevel.h"
6 10
11#if PERL_VERSION < 6
12# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr
14# endif
15# ifndef call_sv
16# define call_sv perl_call_sv
17# endif
18# ifndef get_sv
19# define get_sv perl_get_sv
20# endif
21# ifndef get_cv
22# define get_cv perl_get_cv
23# endif
24# ifndef IS_PADGV
25# define IS_PADGV(v) 0
26# endif
27# ifndef IS_PADCONST
28# define IS_PADCONST(v) 0
29# endif
30#endif
31
7#include <signal.h> 32#include <errno.h>
33
34#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
35# undef STACKGUARD
36#endif
37
38#ifndef STACKGUARD
39# define STACKGUARD 0
40#endif
8 41
9#ifdef HAVE_MMAP 42#ifdef HAVE_MMAP
10# include <unistd.h> 43# include <unistd.h>
11# include <sys/mman.h> 44# include <sys/mman.h>
12# ifndef MAP_ANON
13# ifdef MAP_ANONYMOUS 45# ifndef MAP_ANONYMOUS
14# define MAP_ANON MAP_ANONYMOUS 46# ifdef MAP_ANON
47# define MAP_ANONYMOUS MAP_ANON
15# else 48# else
16# undef HAVE_MMAP 49# undef HAVE_MMAP
17# endif 50# endif
18# endif 51# endif
52# include <limits.h>
53# ifndef PAGESIZE
54# define PAGESIZE pagesize
55# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
56static long pagesize;
57# else
58# define BOOT_PAGESIZE
19#endif 59# endif
20 60#endif
21#define MAY_FLUSH /* increases codesize */
22 61
23#define SUB_INIT "Coro::State::initialize" 62#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 63#define UCORO_STATE "_coro_state"
25 64
26/* The next macro should delcare a variable stacklevel that contains and approximation 65/* The next macro should declare a variable stacklevel that contains and approximation
27 * to the current C stack pointer. Its property is that it changes with each call 66 * to the current C stack pointer. Its property is that it changes with each call
28 * and should be unique. */ 67 * and should be unique. */
29#define dSTACKLEVEL void *stacklevel = &stacklevel 68#define dSTACKLEVEL void *stacklevel = &stacklevel
30 69
70#define IN_DESTRUCT (PL_main_cv == Nullcv)
71
31#define labs(l) ((l) >= 0 ? (l) : -(l)) 72#define labs(l) ((l) >= 0 ? (l) : -(l))
32 73
33#include "CoroAPI.h" 74#include "CoroAPI.h"
34 75
76#ifdef USE_ITHREADS
77static perl_mutex coro_mutex;
78# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
79# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
80#else
81# define LOCK (void)0
82# define UNLOCK (void)0
83#endif
84
35static struct CoroAPI coroapi; 85static struct CoroAPI coroapi;
86static AV *main_mainstack; /* used to differentiate between $main and others */
87static HV *coro_state_stash;
88static SV *ucoro_state_sv;
89static U32 ucoro_state_hash;
90static SV *coro_mortal; /* will be freed after next transfer */
36 91
37/* this is actually not only the c stack but also c registers etc... */ 92/* this is actually not only the c stack but also c registers etc... */
38typedef struct { 93typedef struct {
39 int refcnt; /* pointer reference counter */ 94 int refcnt; /* pointer reference counter */
40 int usecnt; /* shared by how many coroutines */ 95 int usecnt; /* shared by how many coroutines */
45 void *sptr; 100 void *sptr;
46 long ssize; /* positive == mmap, otherwise malloc */ 101 long ssize; /* positive == mmap, otherwise malloc */
47} coro_stack; 102} coro_stack;
48 103
49struct coro { 104struct coro {
105 /* the top-level JMPENV for each coroutine, needed to catch dies. */
106 JMPENV start_env;
107
50 /* the optional C context */ 108 /* the optional C context */
51 coro_stack *stack; 109 coro_stack *stack;
52 void *cursp; 110 void *cursp;
53 int gencnt; 111 int gencnt;
54 112
66 AV *curstack; 124 AV *curstack;
67 AV *mainstack; 125 AV *mainstack;
68 SV **stack_sp; 126 SV **stack_sp;
69 OP *op; 127 OP *op;
70 SV **curpad; 128 SV **curpad;
129 AV *comppad;
130 CV *compcv;
71 SV **stack_base; 131 SV **stack_base;
72 SV **stack_max; 132 SV **stack_max;
73 SV **tmps_stack; 133 SV **tmps_stack;
74 I32 tmps_floor; 134 I32 tmps_floor;
75 I32 tmps_ix; 135 I32 tmps_ix;
84 I32 savestack_ix; 144 I32 savestack_ix;
85 I32 savestack_max; 145 I32 savestack_max;
86 OP **retstack; 146 OP **retstack;
87 I32 retstack_ix; 147 I32 retstack_ix;
88 I32 retstack_max; 148 I32 retstack_max;
149 PMOP *curpm;
89 COP *curcop; 150 COP *curcop;
90 JMPENV *top_env; 151 JMPENV *top_env;
91 152
92 /* data associated with this coroutine (initial args) */ 153 /* data associated with this coroutine (initial args) */
93 AV *args; 154 AV *args;
94}; 155};
95 156
96typedef struct coro *Coro__State; 157typedef struct coro *Coro__State;
97typedef struct coro *Coro__State_or_hashref; 158typedef struct coro *Coro__State_or_hashref;
98 159
99static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *
100static HV *coro_state_stash; 161coro_clone_padlist (pTHX_ CV *cv)
101static SV *ucoro_state_sv;
102static U32 ucoro_state_hash;
103static HV *padlist_cache;
104
105/* mostly copied from op.c:cv_clone2 */
106STATIC AV *
107clone_padlist (AV *protopadlist)
108{ 162{
109 AV *av; 163 AV *padlist = CvPADLIST (cv);
110 I32 ix;
111 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
112 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
113 SV **pname = AvARRAY (protopad_name);
114 SV **ppad = AvARRAY (protopad);
115 I32 fname = AvFILLp (protopad_name);
116 I32 fpad = AvFILLp (protopad);
117 AV *newpadlist, *newpad_name, *newpad; 164 AV *newpadlist, *newpad;
118 SV **npad;
119
120 newpad_name = newAV ();
121 for (ix = fname; ix >= 0; ix--)
122 av_store (newpad_name, ix, SvREFCNT_inc (pname[ix]));
123
124 newpad = newAV ();
125 av_fill (newpad, AvFILLp (protopad));
126 npad = AvARRAY (newpad);
127 165
128 newpadlist = newAV (); 166 newpadlist = newAV ();
129 AvREAL_off (newpadlist); 167 AvREAL_off (newpadlist);
130 av_store (newpadlist, 0, (SV *) newpad_name); 168 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
169 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
170 --AvFILLp (padlist);
171
172 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
131 av_store (newpadlist, 1, (SV *) newpad); 173 av_store (newpadlist, 1, (SV *)newpad);
132 174
133 av = newAV (); /* will be @_ */ 175 return newpadlist;
134 av_extend (av, 0); 176}
135 av_store (newpad, 0, (SV *) av);
136 AvFLAGS (av) = AVf_REIFY;
137 177
138 for (ix = fpad; ix > 0; ix--) 178static void
179free_padlist (pTHX_ AV *padlist)
180{
181 /* may be during global destruction */
182 if (SvREFCNT (padlist))
139 { 183 {
140 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 184 I32 i = AvFILLp (padlist);
141 if (namesv && namesv != &PL_sv_undef) 185 while (i >= 0)
142 { 186 {
143 char *name = SvPVX (namesv); /* XXX */ 187 SV **svp = av_fetch (padlist, i--, FALSE);
144 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 188 if (svp)
145 { /* lexical from outside? */
146 npad[ix] = SvREFCNT_inc (ppad[ix]);
147 } 189 {
148 else
149 { /* our own lexical */
150 SV *sv; 190 SV *sv;
151 if (*name == '&') 191 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
152 sv = SvREFCNT_inc (ppad[ix]); 192 SvREFCNT_dec (sv);
153 else if (*name == '@') 193
154 sv = (SV *) newAV (); 194 SvREFCNT_dec (*svp);
155 else if (*name == '%')
156 sv = (SV *) newHV ();
157 else
158 sv = NEWSV (0, 0);
159 if (!SvPADBUSY (sv))
160 SvPADMY_on (sv);
161 npad[ix] = sv;
162 } 195 }
163 } 196 }
164 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 197
165 { 198 SvREFCNT_dec ((SV*)padlist);
166 npad[ix] = SvREFCNT_inc (ppad[ix]);
167 }
168 else
169 {
170 SV *sv = NEWSV (0, 0);
171 SvPADTMP_on (sv);
172 npad[ix] = sv;
173 }
174 } 199 }
200}
175 201
176#if 0 /* return -ENOTUNDERSTOOD */ 202static int
177 /* Now that vars are all in place, clone nested closures. */ 203coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
204{
205 AV *padlist;
206 AV *av = (AV *)mg->mg_obj;
178 207
179 for (ix = fpad; ix > 0; ix--) { 208 /* casting is fun. */
180 SV* namesv = (ix <= fname) ? pname[ix] : Nullsv; 209 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
181 if (namesv 210 free_padlist (aTHX_ padlist);
182 && namesv != &PL_sv_undef 211
183 && !(SvFLAGS(namesv) & SVf_FAKE) 212 SvREFCNT_dec (av);
184 && *SvPVX(namesv) == '&' 213
185 && CvCLONE(ppad[ix])) 214 return 0;
186 { 215}
187 CV *kid = cv_clone((CV*)ppad[ix]); 216
188 SvREFCNT_dec(ppad[ix]); 217#define PERL_MAGIC_coro PERL_MAGIC_ext
189 CvCLONE_on(kid); 218
190 SvPADMY_on(kid); 219static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
191 npad[ix] = (SV*)kid; 220
192 } 221/* the next two functions merely cache the padlists */
222static void
223get_padlist (pTHX_ CV *cv)
224{
225 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
226
227 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
228 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
229 else
230 {
231#if 0
232 /* this should work - but it doesn't :( */
233 CV *cp = Perl_cv_clone (aTHX_ cv);
234 CvPADLIST (cv) = CvPADLIST (cp);
235 CvPADLIST (cp) = 0;
236 SvREFCNT_dec (cp);
237#else
238 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
239#endif
240 }
241}
242
243static void
244put_padlist (pTHX_ CV *cv)
245{
246 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
247
248 if (!mg)
249 {
250 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
251 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
252 mg->mg_virtual = &vtbl_coro;
253 mg->mg_obj = (SV *)newAV ();
193 } 254 }
194#endif
195 255
196 return newpadlist;
197}
198
199#ifdef MAY_FLUSH
200STATIC void
201free_padlist (AV *padlist)
202{
203 /* may be during global destruction */
204 if (SvREFCNT(padlist))
205 {
206 I32 i = AvFILLp(padlist);
207 while (i >= 0)
208 {
209 SV **svp = av_fetch(padlist, i--, FALSE);
210 SV *sv = svp ? *svp : Nullsv;
211 if (sv)
212 SvREFCNT_dec(sv);
213 }
214
215 SvREFCNT_dec((SV*)padlist);
216 }
217}
218#endif
219
220/* the next two functions merely cache the padlists */
221STATIC void
222get_padlist (CV *cv)
223{
224 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0);
225
226 if (he && AvFILLp ((AV *)*he) >= 0)
227 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he);
228 else
229 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
230}
231
232STATIC void
233put_padlist (CV *cv)
234{
235 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1);
236
237 if (SvTYPE (*he) != SVt_PVAV)
238 {
239 SvREFCNT_dec (*he);
240 *he = (SV *)newAV ();
241 }
242
243 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 256 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
244} 257}
245
246#ifdef MAY_FLUSH
247STATIC void
248flush_padlist_cache ()
249{
250 HV *hv = padlist_cache;
251 padlist_cache = newHV ();
252
253 if (hv_iterinit (hv))
254 {
255 HE *he;
256 AV *padlist;
257
258 while (!!(he = hv_iternext (hv)))
259 {
260 AV *av = (AV *)HeVAL(he);
261
262 /* casting is fun. */
263 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
264 free_padlist (padlist);
265 }
266 }
267
268 SvREFCNT_dec (hv);
269}
270#endif
271 258
272#define SB do { 259#define SB do {
273#define SE } while (0) 260#define SE } while (0)
274 261
275#define LOAD(state) SB load_state(aTHX_ (state)); SPAGAIN; SE 262#define LOAD(state) load_state(aTHX_ (state));
276#define SAVE(state,flags) SB PUTBACK; save_state(aTHX_ (state),(flags)); SE 263#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
277 264
278#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 265#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
279 266
280static void 267static void
281load_state(pTHX_ Coro__State c) 268load_state(pTHX_ Coro__State c)
282{ 269{
283 PL_dowarn = c->dowarn; 270 PL_dowarn = c->dowarn;
287 PL_curstack = c->curstack; 274 PL_curstack = c->curstack;
288 PL_mainstack = c->mainstack; 275 PL_mainstack = c->mainstack;
289 PL_stack_sp = c->stack_sp; 276 PL_stack_sp = c->stack_sp;
290 PL_op = c->op; 277 PL_op = c->op;
291 PL_curpad = c->curpad; 278 PL_curpad = c->curpad;
279 PL_comppad = c->comppad;
280 PL_compcv = c->compcv;
292 PL_stack_base = c->stack_base; 281 PL_stack_base = c->stack_base;
293 PL_stack_max = c->stack_max; 282 PL_stack_max = c->stack_max;
294 PL_tmps_stack = c->tmps_stack; 283 PL_tmps_stack = c->tmps_stack;
295 PL_tmps_floor = c->tmps_floor; 284 PL_tmps_floor = c->tmps_floor;
296 PL_tmps_ix = c->tmps_ix; 285 PL_tmps_ix = c->tmps_ix;
302 PL_scopestack_ix = c->scopestack_ix; 291 PL_scopestack_ix = c->scopestack_ix;
303 PL_scopestack_max = c->scopestack_max; 292 PL_scopestack_max = c->scopestack_max;
304 PL_savestack = c->savestack; 293 PL_savestack = c->savestack;
305 PL_savestack_ix = c->savestack_ix; 294 PL_savestack_ix = c->savestack_ix;
306 PL_savestack_max = c->savestack_max; 295 PL_savestack_max = c->savestack_max;
296#if PERL_VERSION < 9
307 PL_retstack = c->retstack; 297 PL_retstack = c->retstack;
308 PL_retstack_ix = c->retstack_ix; 298 PL_retstack_ix = c->retstack_ix;
309 PL_retstack_max = c->retstack_max; 299 PL_retstack_max = c->retstack_max;
300#endif
301 PL_curpm = c->curpm;
310 PL_curcop = c->curcop; 302 PL_curcop = c->curcop;
311 PL_top_env = c->top_env; 303 PL_top_env = c->top_env;
312 304
313 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 305 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
314 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 306 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
323 { 315 {
324 AV *padlist = (AV *)POPs; 316 AV *padlist = (AV *)POPs;
325 317
326 if (padlist) 318 if (padlist)
327 { 319 {
328 put_padlist (cv); /* mark this padlist as available */ 320 put_padlist (aTHX_ cv); /* mark this padlist as available */
329 CvPADLIST(cv) = padlist; 321 CvPADLIST(cv) = padlist;
330#ifdef USE_THREADS
331 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
332#endif
333 } 322 }
334 323
335 ++CvDEPTH(cv); 324 ++CvDEPTH(cv);
336 } 325 }
337 326
355 344
356 PUSHs (Nullsv); 345 PUSHs (Nullsv);
357 /* this loop was inspired by pp_caller */ 346 /* this loop was inspired by pp_caller */
358 for (;;) 347 for (;;)
359 { 348 {
360 do 349 while (cxix >= 0)
361 { 350 {
362 PERL_CONTEXT *cx = &ccstk[cxix--]; 351 PERL_CONTEXT *cx = &ccstk[cxix--];
363 352
364 if (CxTYPE(cx) == CXt_SUB) 353 if (CxTYPE(cx) == CXt_SUB)
365 { 354 {
366 CV *cv = cx->blk_sub.cv; 355 CV *cv = cx->blk_sub.cv;
367 if (CvDEPTH(cv)) 356 if (CvDEPTH(cv))
368 { 357 {
369#ifdef USE_THREADS
370 /*XPUSHs ((SV *)CvOWNER(cv));*/
371 /*CvOWNER(cv) = 0;*/
372 /*error must unlock this cv etc.. etc...*/
373#endif
374 EXTEND (SP, CvDEPTH(cv)*2); 358 EXTEND (SP, CvDEPTH(cv)*2);
375 359
376 while (--CvDEPTH(cv)) 360 while (--CvDEPTH(cv))
377 { 361 {
378 /* this tells the restore code to increment CvDEPTH */ 362 /* this tells the restore code to increment CvDEPTH */
381 } 365 }
382 366
383 PUSHs ((SV *)CvPADLIST(cv)); 367 PUSHs ((SV *)CvPADLIST(cv));
384 PUSHs ((SV *)cv); 368 PUSHs ((SV *)cv);
385 369
386 get_padlist (cv); /* this is a monster */ 370 get_padlist (aTHX_ cv);
387 } 371 }
388 } 372 }
373#ifdef CXt_FORMAT
389 else if (CxTYPE(cx) == CXt_FORMAT) 374 else if (CxTYPE(cx) == CXt_FORMAT)
390 { 375 {
391 /* I never used formats, so how should I know how these are implemented? */ 376 /* I never used formats, so how should I know how these are implemented? */
392 /* my bold guess is as a simple, plain sub... */ 377 /* my bold guess is as a simple, plain sub... */
393 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 378 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
394 } 379 }
380#endif
395 } 381 }
396 while (cxix >= 0);
397 382
398 if (top_si->si_type == PERLSI_MAIN) 383 if (top_si->si_type == PERLSI_MAIN)
399 break; 384 break;
400 385
401 top_si = top_si->si_prev; 386 top_si = top_si->si_prev;
407 } 392 }
408 393
409 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 394 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
410 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 395 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
411 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 396 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
412
413 /* I have not the slightest idea of why av_reify is necessary */
414 /* but if it's missing the defav contents magically get replaced sometimes */
415 if (c->defav)
416 av_reify (c->defav);
417 397
418 c->dowarn = PL_dowarn; 398 c->dowarn = PL_dowarn;
419 c->in_eval = PL_in_eval; 399 c->in_eval = PL_in_eval;
420 400
421 c->curstackinfo = PL_curstackinfo; 401 c->curstackinfo = PL_curstackinfo;
422 c->curstack = PL_curstack; 402 c->curstack = PL_curstack;
423 c->mainstack = PL_mainstack; 403 c->mainstack = PL_mainstack;
424 c->stack_sp = PL_stack_sp; 404 c->stack_sp = PL_stack_sp;
425 c->op = PL_op; 405 c->op = PL_op;
426 c->curpad = PL_curpad; 406 c->curpad = PL_curpad;
407 c->comppad = PL_comppad;
408 c->compcv = PL_compcv;
427 c->stack_base = PL_stack_base; 409 c->stack_base = PL_stack_base;
428 c->stack_max = PL_stack_max; 410 c->stack_max = PL_stack_max;
429 c->tmps_stack = PL_tmps_stack; 411 c->tmps_stack = PL_tmps_stack;
430 c->tmps_floor = PL_tmps_floor; 412 c->tmps_floor = PL_tmps_floor;
431 c->tmps_ix = PL_tmps_ix; 413 c->tmps_ix = PL_tmps_ix;
437 c->scopestack_ix = PL_scopestack_ix; 419 c->scopestack_ix = PL_scopestack_ix;
438 c->scopestack_max = PL_scopestack_max; 420 c->scopestack_max = PL_scopestack_max;
439 c->savestack = PL_savestack; 421 c->savestack = PL_savestack;
440 c->savestack_ix = PL_savestack_ix; 422 c->savestack_ix = PL_savestack_ix;
441 c->savestack_max = PL_savestack_max; 423 c->savestack_max = PL_savestack_max;
424#if PERL_VERSION < 9
442 c->retstack = PL_retstack; 425 c->retstack = PL_retstack;
443 c->retstack_ix = PL_retstack_ix; 426 c->retstack_ix = PL_retstack_ix;
444 c->retstack_max = PL_retstack_max; 427 c->retstack_max = PL_retstack_max;
428#endif
429 c->curpm = PL_curpm;
445 c->curcop = PL_curcop; 430 c->curcop = PL_curcop;
446 c->top_env = PL_top_env; 431 c->top_env = PL_top_env;
447} 432}
448 433
449/* 434/*
450 * allocate various perl stacks. This is an exact copy 435 * allocate various perl stacks. This is an exact copy
451 * of perl.c:init_stacks, except that it uses less memory 436 * of perl.c:init_stacks, except that it uses less memory
452 * on the assumption that coroutines do not usually need 437 * on the (sometimes correct) assumption that coroutines do
453 * a lot of stackspace. 438 * not usually need a lot of stackspace.
454 */ 439 */
455STATIC void 440static void
456coro_init_stacks (pTHX) 441coro_init_stacks (pTHX)
457{ 442{
443 LOCK;
444
458 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 445 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
459 PL_curstackinfo->si_type = PERLSI_MAIN; 446 PL_curstackinfo->si_type = PERLSI_MAIN;
460 PL_curstack = PL_curstackinfo->si_stack; 447 PL_curstack = PL_curstackinfo->si_stack;
461 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 448 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
462 449
471 458
472 New(54,PL_markstack,16,I32); 459 New(54,PL_markstack,16,I32);
473 PL_markstack_ptr = PL_markstack; 460 PL_markstack_ptr = PL_markstack;
474 PL_markstack_max = PL_markstack + 16; 461 PL_markstack_max = PL_markstack + 16;
475 462
463#ifdef SET_MARK_OFFSET
476 SET_MARK_OFFSET; 464 SET_MARK_OFFSET;
465#endif
477 466
478 New(54,PL_scopestack,16,I32); 467 New(54,PL_scopestack,16,I32);
479 PL_scopestack_ix = 0; 468 PL_scopestack_ix = 0;
480 PL_scopestack_max = 16; 469 PL_scopestack_max = 16;
481 470
482 New(54,PL_savestack,96,ANY); 471 New(54,PL_savestack,96,ANY);
483 PL_savestack_ix = 0; 472 PL_savestack_ix = 0;
484 PL_savestack_max = 96; 473 PL_savestack_max = 96;
485 474
475#if PERL_VERSION < 9
486 New(54,PL_retstack,8,OP*); 476 New(54,PL_retstack,8,OP*);
487 PL_retstack_ix = 0; 477 PL_retstack_ix = 0;
488 PL_retstack_max = 8; 478 PL_retstack_max = 8;
479#endif
480
481 UNLOCK;
489} 482}
490 483
491/* 484/*
492 * destroy the stacks, the callchain etc... 485 * destroy the stacks, the callchain etc...
493 * still there is a memleak of 128 bytes...
494 */ 486 */
495STATIC void 487static void
496destroy_stacks(pTHX) 488destroy_stacks(pTHX)
497{ 489{
490 if (!IN_DESTRUCT)
491 {
498 /* is this ugly, I ask? */ 492 /* is this ugly, I ask? */
499 while (PL_scopestack_ix) 493 LEAVE_SCOPE (0);
500 LEAVE;
501 494
502 /* sure it is, but more important: is it correct?? :/ */ 495 /* sure it is, but more important: is it correct?? :/ */
503 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
504 FREETMPS; 496 FREETMPS;
497
498 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
499 }
505 500
506 while (PL_curstackinfo->si_next) 501 while (PL_curstackinfo->si_next)
507 PL_curstackinfo = PL_curstackinfo->si_next; 502 PL_curstackinfo = PL_curstackinfo->si_next;
508 503
509 while (PL_curstackinfo) 504 while (PL_curstackinfo)
510 { 505 {
511 PERL_SI *p = PL_curstackinfo->si_prev; 506 PERL_SI *p = PL_curstackinfo->si_prev;
512 507
513 { 508 { /*D*//*remove*/
514 dSP; 509 dSP;
515 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 510 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
516 PUTBACK; /* possibly superfluous */ 511 PUTBACK; /* possibly superfluous */
517 } 512 }
518 513
519 if (PL_main_cv != Nullcv) /* don't during destruction. hack? */ 514 if (!IN_DESTRUCT)
520 dounwind(-1); 515 {
521 516 dounwind (-1);/*D*//*remove*/
522 SvREFCNT_dec(PL_curstackinfo->si_stack); 517 SvREFCNT_dec (PL_curstackinfo->si_stack);
518 }
519
523 Safefree(PL_curstackinfo->si_cxstack); 520 Safefree (PL_curstackinfo->si_cxstack);
524 Safefree(PL_curstackinfo); 521 Safefree (PL_curstackinfo);
525 PL_curstackinfo = p; 522 PL_curstackinfo = p;
526 } 523 }
527 524
528 Safefree(PL_tmps_stack); 525 Safefree (PL_tmps_stack);
529 Safefree(PL_markstack); 526 Safefree (PL_markstack);
530 Safefree(PL_scopestack); 527 Safefree (PL_scopestack);
531 Safefree(PL_savestack); 528 Safefree (PL_savestack);
529#if PERL_VERSION < 9
532 Safefree(PL_retstack); 530 Safefree (PL_retstack);
531#endif
533} 532}
534 533
535static void 534static void
536allocate_stack (Coro__State ctx, int alloc) 535allocate_stack (Coro__State ctx, int alloc)
537{ 536{
540 New (0, stack, 1, coro_stack); 539 New (0, stack, 1, coro_stack);
541 540
542 stack->refcnt = 1; 541 stack->refcnt = 1;
543 stack->usecnt = 1; 542 stack->usecnt = 1;
544 stack->gencnt = ctx->gencnt = 0; 543 stack->gencnt = ctx->gencnt = 0;
544
545 if (alloc) 545 if (alloc)
546 { 546 {
547#ifdef HAVE_MMAP 547#if HAVE_MMAP
548 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 548 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* mmap should do allocate-on-write for us */
549 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0); 549 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
550 if (stack->sptr == (void *)-1) 550 if (stack->sptr != (void *)-1)
551#endif
552 { 551 {
553 /*FIXME*//*D*//* reasonable stack size! */ 552# if STACKGUARD
553 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
554# endif
555 }
556 else
557#endif
558 {
554 stack->ssize = -4096 * sizeof (long); 559 stack->ssize = - (STACKSIZE * (long)sizeof (long));
555 New (0, stack->sptr, 4096, long); 560 New (0, stack->sptr, STACKSIZE, long);
556 } 561 }
557 } 562 }
558 else 563 else
559 stack->sptr = 0; 564 stack->sptr = 0;
560 565
574 { 579 {
575#ifdef HAVE_MMAP 580#ifdef HAVE_MMAP
576 if (stack->ssize > 0 && stack->sptr) 581 if (stack->ssize > 0 && stack->sptr)
577 munmap (stack->sptr, stack->ssize); 582 munmap (stack->sptr, stack->ssize);
578 else 583 else
579#else 584#endif
580 Safefree (stack->sptr); 585 Safefree (stack->sptr);
581#endif 586
582 Safefree (stack); 587 Safefree (stack);
583 } 588 }
584 else if (ctx->gencnt == stack->gencnt) 589 else if (ctx->gencnt == stack->gencnt)
585 --stack->usecnt; 590 --stack->usecnt;
586 } 591 }
590setup_coro (void *arg) 595setup_coro (void *arg)
591{ 596{
592 /* 597 /*
593 * emulate part of the perl startup here. 598 * emulate part of the perl startup here.
594 */ 599 */
600 dTHX;
595 dSP; 601 dSP;
596 Coro__State ctx = (Coro__State)arg; 602 Coro__State ctx = (Coro__State)arg;
597 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 603 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
598 604
599 coro_init_stacks (aTHX); 605 coro_init_stacks (aTHX);
600 /*PL_curcop = 0;*/ 606 /*PL_curcop = 0;*/
601 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 607 /*PL_in_eval = PL_in_eval;*/ /* inherit */
602 SvREFCNT_dec (GvAV (PL_defgv)); 608 SvREFCNT_dec (GvAV (PL_defgv));
603 GvAV (PL_defgv) = ctx->args; 609 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
604 610
605 SPAGAIN; 611 SPAGAIN;
606 612
607 if (ctx->stack) 613 if (ctx->stack)
608 { 614 {
635 * that doesn't matter, though, since it is only 641 * that doesn't matter, though, since it is only
636 * pp_nextstate and we never return... 642 * pp_nextstate and we never return...
637 * ah yes, and I don't care anyways ;) 643 * ah yes, and I don't care anyways ;)
638 */ 644 */
639 PUTBACK; 645 PUTBACK;
640 PL_op = pp_entersub(); 646 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
641 SPAGAIN; 647 SPAGAIN;
642 648
643 ENTER; /* necessary e.g. for dounwind */ 649 ENTER; /* necessary e.g. for dounwind */
644 } 650 }
645} 651}
648continue_coro (void *arg) 654continue_coro (void *arg)
649{ 655{
650 /* 656 /*
651 * this is a _very_ stripped down perl interpreter ;) 657 * this is a _very_ stripped down perl interpreter ;)
652 */ 658 */
659 dTHX;
653 Coro__State ctx = (Coro__State)arg; 660 Coro__State ctx = (Coro__State)arg;
654 661
655 /*FIXME*//* must set up top_env here */ 662 PL_top_env = &ctx->start_env;
663
656 ctx->cursp = 0; 664 ctx->cursp = 0;
657 PL_op = PL_op->op_next; 665 PL_op = PL_op->op_next;
658 CALLRUNOPS(aTHX); 666 CALLRUNOPS(aTHX);
659 667
660 abort (); 668 abort ();
661} 669}
662 670
663STATIC void 671static void
664transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 672transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
665{ 673{
666 dSP;
667 dSTACKLEVEL; 674 dSTACKLEVEL;
668 675
669 if (prev != next) 676 if (prev != next)
670 { 677 {
671 if (next->mainstack) 678 if (next->mainstack)
672 { 679 {
680 LOCK;
673 SAVE (prev, flags); 681 SAVE (prev, flags);
674 LOAD (next); 682 LOAD (next);
683 UNLOCK;
675 684
676 /* mark this state as in-use */ 685 /* mark this state as in-use */
677 next->mainstack = 0; 686 next->mainstack = 0;
678 next->tmps_ix = -2; 687 next->tmps_ix = -2;
679 688
698 continue_coro, (void *)next, 707 continue_coro, (void *)next,
699 next->stack->sptr, labs (next->stack->ssize)); 708 next->stack->sptr, labs (next->stack->ssize));
700 } 709 }
701 710
702 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 711 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
712 prev->cursp = stacklevel;
713 /* don't add any code here */
703 } 714 }
704 715 else
716 next->cursp = stacklevel;
705 } 717 }
706 else if (next->tmps_ix == -2) 718 else if (next->tmps_ix == -2)
707 croak ("tried to transfer to running coroutine"); 719 croak ("tried to transfer to running coroutine");
708 else 720 else
709 { 721 {
722 LOCK;
710 SAVE (prev, -1); /* first get rid of the old state */ 723 SAVE (prev, -1); /* first get rid of the old state */
724 UNLOCK;
711 725
712 if (flags & TRANSFER_SAVE_CCTXT) 726 if (flags & TRANSFER_SAVE_CCTXT)
713 { 727 {
714 if (!prev->stack) 728 if (!prev->stack)
715 allocate_stack (prev, 0); 729 allocate_stack (prev, 0);
716 730
717 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 731 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
718 { 732 {
733 PL_top_env = &next->start_env;
734
719 setup_coro (next); 735 setup_coro (next);
736 next->cursp = stacklevel;
720 737
721 prev->stack->refcnt++; 738 prev->stack->refcnt++;
722 prev->stack->usecnt++; 739 prev->stack->usecnt++;
723 next->stack = prev->stack; 740 next->stack = prev->stack;
724 next->gencnt = prev->gencnt; 741 next->gencnt = prev->gencnt;
725 } 742 }
726 else 743 else
727 { 744 {
745 assert (!next->stack);
728 allocate_stack (next, 1); 746 allocate_stack (next, 1);
729 coro_create (&(next->stack->cctx), 747 coro_create (&(next->stack->cctx),
730 setup_coro, (void *)next, 748 setup_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 749 next->stack->sptr, labs (next->stack->ssize));
732 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 750 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
751 prev->cursp = stacklevel;
752 /* don't add any code here */
733 } 753 }
734 } 754 }
735 else 755 else
756 {
736 setup_coro (next); 757 setup_coro (next);
758 next->cursp = stacklevel;
759 }
737 } 760 }
738 } 761 }
739 762
740 next->cursp = stacklevel; 763 LOCK;
741} 764 if (coro_mortal)
742
743static struct coro *
744sv_to_coro (SV *arg, const char *funcname, const char *varname)
745{
746 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
747 { 765 {
748 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 766 SvREFCNT_dec (coro_mortal);
749 767 coro_mortal = 0;
750 if (!he)
751 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
752
753 arg = HeVAL(he);
754 } 768 }
755 769 UNLOCK;
770}
771
772#define SV_CORO(sv,func) \
773 do { \
774 if (SvROK (sv)) \
775 sv = SvRV (sv); \
776 \
777 if (SvTYPE (sv) == SVt_PVHV) \
778 { \
779 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
780 \
781 if (!he) \
782 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
783 \
784 (sv) = SvRV (HeVAL(he)); \
785 } \
786 \
756 /* must also be changed inside Coro::Cont::yield */ 787 /* must also be changed inside Coro::Cont::yield */ \
757 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 788 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
758 return (struct coro *) SvIV((SV*)SvRV(arg));
759
760 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 789 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
761 /*NORETURN*/ 790 \
762} 791 } while(0)
792
793#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
763 794
764static void 795static void
765api_transfer(pTHX_ SV *prev, SV *next, int flags) 796api_transfer(pTHX_ SV *prev, SV *next, int flags)
766{ 797{
767 transfer(aTHX_ 798 SV_CORO (prev, "Coro::transfer");
768 sv_to_coro (prev, "Coro::transfer", "prev"), 799 SV_CORO (next, "Coro::transfer");
769 sv_to_coro (next, "Coro::transfer", "next"), 800
770 flags); 801 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
771} 802}
772 803
773/** Coro ********************************************************************/ 804/** Coro ********************************************************************/
774 805
775#define PRIO_MAX 3 806#define PRIO_MAX 3
783static GV *coro_current, *coro_idle; 814static GV *coro_current, *coro_idle;
784static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 815static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
785static int coro_nready; 816static int coro_nready;
786 817
787static void 818static void
788coro_enq (SV *sv) 819coro_enq (pTHX_ SV *sv)
789{ 820{
790 if (SvROK (sv)) 821 SV **xprio;
791 { 822 int prio;
792 SV *hv = SvRV (sv); 823
793 if (SvTYPE (hv) == SVt_PVHV) 824 if (SvTYPE (sv) != SVt_PVHV)
794 {
795 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0);
796 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
797
798 prio = prio > PRIO_MAX ? PRIO_MAX
799 : prio < PRIO_MIN ? PRIO_MIN
800 : prio;
801
802 av_push (coro_ready [prio - PRIO_MIN], sv);
803 coro_nready++;
804
805 return;
806 }
807 }
808
809 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 825 croak ("Coro::ready tried to enqueue something that is not a coroutine");
826
827 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
828 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
829
830 prio = prio > PRIO_MAX ? PRIO_MAX
831 : prio < PRIO_MIN ? PRIO_MIN
832 : prio;
833
834 av_push (coro_ready [prio - PRIO_MIN], sv);
835 coro_nready++;
810} 836}
811 837
812static SV * 838static SV *
813coro_deq (int min_prio) 839coro_deq (pTHX_ int min_prio)
814{ 840{
815 int prio = PRIO_MAX - PRIO_MIN; 841 int prio = PRIO_MAX - PRIO_MIN;
816 842
817 min_prio -= PRIO_MIN; 843 min_prio -= PRIO_MIN;
818 if (min_prio < 0) 844 if (min_prio < 0)
829} 855}
830 856
831static void 857static void
832api_ready (SV *coro) 858api_ready (SV *coro)
833{ 859{
860 dTHX;
861
862 if (SvROK (coro))
863 coro = SvRV (coro);
864
865 LOCK;
834 coro_enq (SvREFCNT_inc (coro)); 866 coro_enq (aTHX_ SvREFCNT_inc (coro));
867 UNLOCK;
835} 868}
836 869
837static void 870static void
838api_schedule (int cede) 871api_schedule (void)
839{ 872{
873 dTHX;
874
840 SV *prev, *next; 875 SV *prev, *next;
841 876
877 LOCK;
878
842 prev = GvSV (coro_current); 879 prev = SvRV (GvSV (coro_current));
843
844 if (cede)
845 coro_enq (SvREFCNT_inc (prev));
846
847 next = coro_deq (PRIO_MIN); 880 next = coro_deq (aTHX_ PRIO_MIN);
848 881
849 if (!next) 882 if (!next)
850 next = SvREFCNT_inc (GvSV (coro_idle)); 883 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
851 884
852 GvSV (coro_current) = SvREFCNT_inc (next); 885 /* free this only after the transfer */
853 transfer (aTHX_ 886 coro_mortal = prev;
854 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 887 SV_CORO (prev, "Coro::schedule");
855 sv_to_coro (next, "Coro::schedule", "next coroutine"), 888
889 SvRV (GvSV (coro_current)) = next;
890
891 SV_CORO (next, "Coro::schedule");
892
893 UNLOCK;
894
895 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
856 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 896 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
857 SvREFCNT_dec (next); 897}
858 SvREFCNT_dec (prev); 898
899static void
900api_cede (void)
901{
902 dTHX;
903
904 LOCK;
905 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
906 UNLOCK;
907
908 api_schedule ();
859} 909}
860 910
861MODULE = Coro::State PACKAGE = Coro::State 911MODULE = Coro::State PACKAGE = Coro::State
862 912
863PROTOTYPES: ENABLE 913PROTOTYPES: ENABLE
864 914
865BOOT: 915BOOT:
866{ /* {} necessary for stoopid perl-5.6.x */ 916{ /* {} necessary for stoopid perl-5.6.x */
917#ifdef USE_ITHREADS
918 MUTEX_INIT (&coro_mutex);
919#endif
920 BOOT_PAGESIZE;
921
867 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 922 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
868 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 923 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
869 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 924 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
870 925
871 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 926 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
872 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 927 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
873 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 928 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
874 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 929 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
875
876 if (!padlist_cache)
877 padlist_cache = newHV ();
878 930
879 main_mainstack = PL_mainstack; 931 main_mainstack = PL_mainstack;
880 932
881 coroapi.ver = CORO_API_VERSION; 933 coroapi.ver = CORO_API_VERSION;
882 coroapi.transfer = api_transfer; 934 coroapi.transfer = api_transfer;
890 Coro__State coro; 942 Coro__State coro;
891 943
892 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 944 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
893 croak ("Coro::State::_newprocess expects an arrayref"); 945 croak ("Coro::State::_newprocess expects an arrayref");
894 946
895 New (0, coro, 1, struct coro); 947 Newz (0, coro, 1, struct coro);
896 948
897 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 949 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
898 coro->mainstack = 0; /* actual work is done inside transfer */ 950 /*coro->mainstack = 0; *//*actual work is done inside transfer */
899 coro->stack = 0; 951 /*coro->stack = 0;*/
952
953 /* same as JMPENV_BOOTSTRAP */
954 /* we might be able to recycle start_env, but safe is safe */
955 /*Zero(&coro->start_env, 1, JMPENV);*/
956 coro->start_env.je_ret = -1;
957 coro->start_env.je_mustcatch = TRUE;
900 958
901 RETVAL = coro; 959 RETVAL = coro;
902 OUTPUT: 960 OUTPUT:
903 RETVAL 961 RETVAL
904 962
905void 963void
906transfer(prev, next, flags) 964transfer(prev, next, flags)
907 Coro::State_or_hashref prev 965 SV *prev
908 Coro::State_or_hashref next 966 SV *next
909 int flags 967 int flags
910 PROTOTYPE: @ 968 PROTOTYPE: @
911 CODE: 969 CODE:
912 PUTBACK; 970 PUTBACK;
971 SV_CORO (next, "Coro::transfer");
972 SV_CORO (prev, "Coro::transfer");
913 transfer (aTHX_ prev, next, flags); 973 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
914 SPAGAIN; 974 SPAGAIN;
915 975
916void 976void
917DESTROY(coro) 977DESTROY(coro)
918 Coro::State coro 978 Coro::State coro
920 980
921 if (coro->mainstack && coro->mainstack != main_mainstack) 981 if (coro->mainstack && coro->mainstack != main_mainstack)
922 { 982 {
923 struct coro temp; 983 struct coro temp;
924 984
985 PUTBACK;
925 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 986 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
926 LOAD(aTHX_ coro); 987 LOAD (aTHX_ coro);
988 SPAGAIN;
927 989
928 destroy_stacks (aTHX); 990 destroy_stacks (aTHX);
929 991
930 LOAD((&temp)); /* this will get rid of defsv etc.. */ 992 LOAD ((&temp)); /* this will get rid of defsv etc.. */
993 SPAGAIN;
931 994
932 coro->mainstack = 0; 995 coro->mainstack = 0;
933 } 996 }
934 997
935 deallocate_stack (coro); 998 deallocate_stack (coro);
936 999 SvREFCNT_dec (coro->args);
937 Safefree (coro); 1000 Safefree (coro);
938
939void
940flush()
941 CODE:
942#ifdef MAY_FLUSH
943 flush_padlist_cache ();
944#endif
945 1001
946void 1002void
947_exit(code) 1003_exit(code)
948 int code 1004 int code
949 PROTOTYPE: $ 1005 PROTOTYPE: $
950 CODE: 1006 CODE:
951#if defined(__GLIBC__) || _POSIX_C_SOURCE
952 _exit (code); 1007 _exit (code);
953#else
954 signal (SIGTERM, SIG_DFL);
955 raise (SIGTERM);
956 exit (code);
957#endif
958 1008
959MODULE = Coro::State PACKAGE = Coro::Cont 1009MODULE = Coro::State PACKAGE = Coro::Cont
960 1010
961# this is slightly dirty (should expose a c-level api) 1011# this is slightly dirty (should expose a c-level api)
962 1012
963void 1013void
964yield(...) 1014yield(...)
965 PROTOTYPE: @ 1015 PROTOTYPE: @
966 CODE: 1016 CODE:
967 static SV *returnstk; 1017 SV *yieldstack;
968 SV *sv; 1018 SV *sv;
969 AV *defav = GvAV (PL_defgv); 1019 AV *defav = GvAV (PL_defgv);
970 struct coro *prev, *next; 1020 struct coro *prev, *next;
971 1021
972 if (!returnstk) 1022 yieldstack = *hv_fetch (
973 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1023 (HV *)SvRV (GvSV (coro_current)),
1024 "yieldstack", sizeof ("yieldstack") - 1,
1025 0
1026 );
974 1027
975 /* set up @_ -- ugly */ 1028 /* set up @_ -- ugly */
976 av_clear (defav); 1029 av_clear (defav);
977 av_fill (defav, items - 1); 1030 av_fill (defav, items - 1);
978 while (items--) 1031 while (items--)
979 av_store (defav, items, SvREFCNT_inc (ST(items))); 1032 av_store (defav, items, SvREFCNT_inc (ST(items)));
980 1033
981 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
982 sv = av_pop ((AV *)SvRV (returnstk)); 1034 sv = av_pop ((AV *)SvRV (yieldstack));
983 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1035 prev = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))));
984 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1036 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))));
985 SvREFCNT_dec (sv); 1037 SvREFCNT_dec (sv);
986 1038
987 transfer(aTHX_ prev, next, 0); 1039 transfer (aTHX_ prev, next, 0);
988 1040
989MODULE = Coro::State PACKAGE = Coro 1041MODULE = Coro::State PACKAGE = Coro
990 1042
991# this is slightly dirty (should expose a c-level api) 1043# this is slightly dirty (should expose a c-level api)
992 1044
1010 1062
1011 { 1063 {
1012 SV *sv = perl_get_sv("Coro::API", 1); 1064 SV *sv = perl_get_sv("Coro::API", 1);
1013 1065
1014 coroapi.schedule = api_schedule; 1066 coroapi.schedule = api_schedule;
1067 coroapi.cede = api_cede;
1015 coroapi.ready = api_ready; 1068 coroapi.ready = api_ready;
1016 coroapi.nready = &coro_nready; 1069 coroapi.nready = &coro_nready;
1017 coroapi.current = coro_current; 1070 coroapi.current = coro_current;
1018 1071
1019 GCoroAPI = &coroapi; 1072 GCoroAPI = &coroapi;
1020 sv_setiv(sv, (IV)&coroapi); 1073 sv_setiv(sv, (IV)&coroapi);
1021 SvREADONLY_on(sv); 1074 SvREADONLY_on(sv);
1022 } 1075 }
1023} 1076}
1024 1077
1078#if !PERL_MICRO
1079
1025void 1080void
1026ready(self) 1081ready(self)
1027 SV * self 1082 SV * self
1083 PROTOTYPE: $
1028 CODE: 1084 CODE:
1029 api_ready (self); 1085 api_ready (self);
1086
1087#endif
1030 1088
1031int 1089int
1032nready(...) 1090nready(...)
1033 PROTOTYPE: 1091 PROTOTYPE:
1034 CODE: 1092 CODE:
1037 RETVAL 1095 RETVAL
1038 1096
1039void 1097void
1040schedule(...) 1098schedule(...)
1041 PROTOTYPE: 1099 PROTOTYPE:
1042 ALIAS:
1043 cede = 1
1044 CODE: 1100 CODE:
1045 api_schedule (ix); 1101 api_schedule ();
1046 1102
1103void
1104cede(...)
1105 PROTOTYPE:
1106 CODE:
1107 api_cede ();
1108
1109# and these are hacks
1110SV *
1111_aio_get_state ()
1112 CODE:
1113{
1114 struct {
1115 int errorno;
1116 int laststype;
1117 int laststatval;
1118 Stat_t statcache;
1119 } data;
1120
1121 data.errorno = errno;
1122 data.laststype = PL_laststype;
1123 data.laststatval = PL_laststatval;
1124 data.statcache = PL_statcache;
1125
1126 RETVAL = newSVpvn ((char *)&data, sizeof data);
1127}
1128 OUTPUT:
1129 RETVAL
1130
1131void
1132_aio_set_state (char *data_)
1133 PROTOTYPE: $
1134 CODE:
1135{
1136 struct {
1137 int errorno;
1138 int laststype;
1139 int laststatval;
1140 Stat_t statcache;
1141 } *data = (void *)data_;
1142
1143 errno = data->errorno;
1144 PL_laststype = data->laststype;
1145 PL_laststatval = data->laststatval;
1146 PL_statcache = data->statcache;
1147}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines