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

Diff Legend

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