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