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