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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines